Merge remote branch 'refs/remotes/origin/fruitiex/gakarmor'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:52:00 +0000 (11:52 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 13 Oct 2010 09:52:00 +0000 (11:52 +0200)
commit9bad86b2cf8cbfcc1c29b6aef66f6cae39476e03
treedd389b021d38275fa7a4c7fb2490b734ea7172c3
parent8475fcbe332ac456559680e8d1d36e7abb8c386f
parentd56bbf3e6c821c4dceb3a66d4580075c36841429
Merge remote branch 'refs/remotes/origin/fruitiex/gakarmor'