From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Sun, 23 Jun 2013 20:47:44 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/domicons
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bfdd2f47f15ff310a812598d5f1cdfdd185f17f7;p=xonotic%2Fxonotic-data.pk3dir.git

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

bfdd2f47f15ff310a812598d5f1cdfdd185f17f7