From: Rudolf Polzer <divverent@xonotic.org>
Date: Tue, 2 Sep 2014 07:42:25 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f58849c76adfc29d243ce4031ca9a2e8d0de1b2;p=xonotic%2Fxonotic.wiki.git

Merge remote-tracking branch 'origin/master'
---

4f58849c76adfc29d243ce4031ca9a2e8d0de1b2