From: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date: Fri, 20 Jan 2012 17:28:54 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master' into theshadow/aqueous
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d3df85c520f9b3c2b69cc900852aff1fd0b64be4;p=xonotic%2Fxonotic-maps.pk3dir.git

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

d3df85c520f9b3c2b69cc900852aff1fd0b64be4