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

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

0f243cec0f1c26ee6ac0b97effe55f7af7703ac3