Merge branch 'Mario/monsters'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 26 Nov 2014 10:43:59 +0000 (11:43 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 26 Nov 2014 10:43:59 +0000 (11:43 +0100)

Trivial merge