Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 7 Nov 2011 12:53:46 +0000 (13:53 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 7 Nov 2011 12:53:46 +0000 (13:53 +0100)
commitfe3038f654ba826f19bf085d81ea767a98c8e6bf
treeb4212f6f836816b92de4dbc6ae9e381bd81b1afc
parentd636e647ad37711dfce5e067a8951acbc8b753f4
parent41be9cd60e4a371e3ebc643a66b2c8612b32c266
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic