From: Samual <samual@xonotic.org>
Date: Sun, 26 Feb 2012 01:23:51 +0000 (-0500)
Subject: Merge remote branch 'origin/terencehill/megaerebus_centered'
X-Git-Tag: xonotic-v0.6.0~42^2~6
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7d4dafbc492a284a6f6ccfc36bb3a28df42e653c;p=xonotic%2Fxonotic-data.pk3dir.git

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

7d4dafbc492a284a6f6ccfc36bb3a28df42e653c