From: Samual <samual@xonotic.org>
Date: Mon, 12 Sep 2011 06:30:27 +0000 (-0400)
Subject: Merge remote branch 'origin/terencehill/megaerebus_image_fix'
X-Git-Tag: xonotic-v0.6.0~40^2~118^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bb4571959d522baddbf445b968aba15bb4ad6f34;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/terencehill/megaerebus_image_fix'
---

bb4571959d522baddbf445b968aba15bb4ad6f34