From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 27 Mar 2012 10:03:28 +0000 (+0200)
Subject: Merge commit '830125fad042fad35dc029b6eb57c8156ad7e176'
X-Git-Tag: xonotic-v0.7.0~16^2~7
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=3c73487420fde8d4a3b5360d8b99e48132517900;hp=e4287c28bb2dafedc81c66e63951d947cfbeb225;p=xonotic%2Fnetradiant.git

Merge commit '830125fad042fad35dc029b6eb57c8156ad7e176'
---