Merge branch 'maint'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Aug 2015 17:19:07 +0000 (19:19 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Aug 2015 17:19:07 +0000 (19:19 +0200)

Trivial merge