From: Pearce Michal <pearcemichal@Pearce-Michals-MacBook-Pro.local>
Date: Wed, 1 Dec 2010 19:15:07 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into theshadow/siege
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0e38d24beb418aa832f6dd4acd6503ea683c7e26;p=xonotic%2Fxonotic-maps.pk3dir.git

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

0e38d24beb418aa832f6dd4acd6503ea683c7e26