From: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date: Mon, 17 Jan 2011 05:52:49 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into theshadow/aqueous
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=166f3f83cddbb3830c4e9f04ea9d34be4ce506ee;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into theshadow/aqueous
---

166f3f83cddbb3830c4e9f04ea9d34be4ce506ee