Merge branch 'master' into samual/weapons
authorRudolf Polzer <divverent@xonotic.org>
Mon, 7 Apr 2014 09:25:08 +0000 (11:25 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 7 Apr 2014 09:25:08 +0000 (11:25 +0200)
commitfca9d306878750e9523e97225c36a4237559b729
treee6bad1ea365e14747734e4cacf8baab0ab8c0567
parent5a4b994669f2dfd32dac6c9fdef3412c98c6baf3
parent710590f689cae3940759b98f3080be6866b85245
Merge branch 'master' into samual/weapons