From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sat, 13 Jul 2013 09:28:58 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/all_map_pk3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1be11bf6f8a796a86286b2074787140b3f68e0ee;p=xonotic%2Fxonotic.git

Merge branch 'master' into matthiaskrgr/all_map_pk3
---

1be11bf6f8a796a86286b2074787140b3f68e0ee