From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Tue, 24 Aug 2010 06:37:00 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into diabolik/facility114-team
X-Git-Tag: xonotic-v0.1.0preview~151^2~34^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=418321bf0cc4e21e305560518f251b4dac1a705b;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into diabolik/facility114-team
---

418321bf0cc4e21e305560518f251b4dac1a705b