Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 20:38:11 +0000 (22:38 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 20:38:11 +0000 (22:38 +0200)
commitd08c026aecb1312c1169fdbe7314ccd8d490414a
tree157162584fd1de4ff42e51dcaeaee2b7c3c8e636
parent7200138b5f9fbeb6eba31968213aac1ce4038e89
parentfd7a48b7a488d9e1bb3a283249a10b21b663999c
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic