Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:09:54 +0000 (14:09 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:09:54 +0000 (14:09 +0100)
commit49de16c6f7d242cb8ea16223bb0bf3c747ae56b8
tree8d74afbe29e91b83c9812944d1d0922af9b99e88
parentfc6ebca703358b9814720cfc4f7313b6ec72e28c
parentaf076b8bdfbf3143f9fbad13a04b039c0ce38473
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic