From: Matthias Krüger <matthias.krueger@famsik.de>
Date: Mon, 30 Sep 2013 15:04:34 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/domicons
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4ec5ed850416626ed5da445dc051f30df3a61a3d;p=xonotic%2Fxonotic-data.pk3dir.git

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

4ec5ed850416626ed5da445dc051f30df3a61a3d