Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Fri, 24 Jan 2014 16:50:17 +0000 (17:50 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 24 Jan 2014 16:50:17 +0000 (17:50 +0100)
commit195408ed3395755d1435480f7c45cfd7d0a2ba81
tree7e8e8aa81bbb0d7d23b65e42f1ebfa87b961b3db
parentbdd3b27aeb81442d030e97a54901aa1b29516275
parentc7e4c0655b2125eaa62df60aab055ee2dac7072c
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic