Merge branch 'master' of ssh://git.xonotic.org/xonotic
authormand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:00:59 +0000 (13:00 -0300)
committermand1nga <mand1nga@xonotic.org>
Mon, 29 Aug 2011 16:00:59 +0000 (13:00 -0300)

Trivial merge