Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Aug 2011 07:43:50 +0000 (09:43 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Aug 2011 07:43:50 +0000 (09:43 +0200)
commitb172ea517999552dffb2bcae2f011c8ad477c029
treed9d4274ef10625390ff66e4b6738f0b959769742
parentc3c600a6d3a3e375c8fa98f1614e63212df51f1c
parent50c7a075664d51a783582fb388e2fd28ac7f65bc
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic