Merge pull request #112 from matthiaskrgr/master xonotic-v0.7.0
authorDale Weiler <killfieldengine@gmail.com>
Sun, 2 Jun 2013 08:38:47 +0000 (01:38 -0700)
committerDale Weiler <killfieldengine@gmail.com>
Sun, 2 Jun 2013 08:38:47 +0000 (01:38 -0700)
commit100eaf913700836457bf17e8f487744dedb84e44
tree74a8af614eeb0f393093a38cd7aed304275f8c5a
parentff63e5bd73e012905568db0fcd3a702fc7f32119
parent69b55ccc03b56af1f6c05eb45866ab198307487f
Merge pull request #112 from matthiaskrgr/master

 mmmeeerging eeeet