Merge remote-tracking branch 'origin/master' into samual/orthoview
authorSamual Lenks <samual@xonotic.org>
Sun, 15 Sep 2013 02:54:15 +0000 (22:54 -0400)
committerSamual Lenks <samual@xonotic.org>
Sun, 15 Sep 2013 02:54:15 +0000 (22:54 -0400)

Trivial merge