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)

Trivial merge