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)
commit0b7855b8e65e0220238a08cdcdd2ca7386e3d06e
tree48141640f7bf6f231b62c36dfd7fb97db56c943d
parentc14f2b067c9ab0b4fb8a5b7805c8679be61f1fe0
parent6662b1587ca7fda471d5af054b459d485ceacf7c
Merge branch 'maint'