From: Sahil Singhal <sahil@sahil-desktop.(none)>
Date: Thu, 19 Aug 2010 17:33:28 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into diabolik/techpanel
X-Git-Tag: xonotic-v0.1.0preview~151^2~36^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7b06fb7791791731fad6ea97a0a7904df3a548d6;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote branch 'origin/master' into diabolik/techpanel
---

7b06fb7791791731fad6ea97a0a7904df3a548d6