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)
commit0aac64457da9a8b6d8075266f6a403bb24fb84ba
tree700777e3eeb5a5dbd3bbc5510d60cc099fd29684
parentf3f9630b60f655962b1197483563076b370ffb29
parentd08c026aecb1312c1169fdbe7314ccd8d490414a
Merge branch 'master' of ssh://git.xonotic.org/xonotic