From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 1 Mar 2012 11:15:33 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/ailmanki/et-engineaftercompile'
X-Git-Tag: xonotic-v0.6.0~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6bc28ad466df5fef38e607a2bde2da83c3e2c029;p=xonotic%2Fnetradiant.git

Merge remote-tracking branch 'origin/ailmanki/et-engineaftercompile'
---

6bc28ad466df5fef38e607a2bde2da83c3e2c029