Merge branch 'master' of /var/cache/git/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 27 Dec 2011 12:54:22 +0000 (13:54 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 27 Dec 2011 12:54:22 +0000 (13:54 +0100)

Trivial merge