From: Rudolf Polzer <divverent@alientrap.org>
Date: Tue, 27 Mar 2012 09:33:51 +0000 (+0200)
Subject: Merge commit '48410b113dd2036e69dbf723a39ec9af02fc9b12'
X-Git-Tag: xonotic-v0.7.0~16^2~12
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=bfc8a12a6b315ae261101a34db8ba1b682c67bb7

Merge commit '48410b113dd2036e69dbf723a39ec9af02fc9b12'
---

bfc8a12a6b315ae261101a34db8ba1b682c67bb7