From: Samual <samual@xonotic.org>
Date: Sun, 26 Feb 2012 01:04:17 +0000 (-0500)
Subject: Merge remote branch 'origin/terencehill/mapping_update'
X-Git-Tag: xonotic-v0.6.0~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a04773f13a6057fbe8072828791075536666d8eb;p=xonotic%2Fxonotic.git

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

a04773f13a6057fbe8072828791075536666d8eb