From: kuniuthefrogg <ekuniu@gmail.com>
Date: Tue, 14 May 2013 21:34:49 +0000 (+0200)
Subject: Merge branch 'master' into kuniuthefrogg/silentsiege
X-Git-Tag: xonotic-v0.7.0~22^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b57a0e63cbe08f33a0989c692993dc408ecb4afb;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into kuniuthefrogg/silentsiege
---

b57a0e63cbe08f33a0989c692993dc408ecb4afb