Merge branch 'maint'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Aug 2015 23:31:23 +0000 (01:31 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 19 Aug 2015 23:31:23 +0000 (01:31 +0200)

Trivial merge