Merge remote-tracking branch 'origin/master' into kuniuthefrogg/abyss
authorSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 09:21:14 +0000 (04:21 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 10 Feb 2013 09:21:14 +0000 (04:21 -0500)

Trivial merge