Merge remote-tracking branch 'origin/ailmanki/et-engineaftercompile'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 11:15:33 +0000 (12:15 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 11:15:33 +0000 (12:15 +0100)

Trivial merge