Merge commit '145caec5a836be05bfd091f175605bed237516e3'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 8 Jul 2013 09:56:30 +0000 (11:56 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 8 Jul 2013 09:56:30 +0000 (11:56 +0200)
commiteda70ff01ada5a6f2510b2e0720ece7ccbab1adf
treea61f4208421db948da6b41eee3060d2a3df2892c
parent5048c320c35091603feb7429ffd2d0966fcac2c7
parent145caec5a836be05bfd091f175605bed237516e3
Merge commit '145caec5a836be05bfd091f175605bed237516e3'