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)
commit17f8cdecf39482eca4a49623d67bfdb5f4477d29
treeb7bad2e78725925706a7cb2eeca7427553ee1585
parent0a6d4cd16b83990beff55c8b7850a492da8864e2
parentf0d7836b015ca4090c6209cca923502bf98c01b1
Merge branch 'maint'