From: Samual <samual@xonotic.org>
Date: Fri, 20 Jan 2012 07:48:10 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/runningman_separate
X-Git-Tag: xonotic-v0.7.0~25^2~23
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b22da6fae94b0574eb7516a3c5bc98b0684ecffc;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into samual/runningman_separate
---

b22da6fae94b0574eb7516a3c5bc98b0684ecffc