From: ssinghal <dib.diabolik@gmail.com>
Date: Tue, 1 Feb 2011 20:21:29 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into diabolik/afterslime
X-Git-Tag: xonotic-v0.5.0~98^2~18^2^2~13
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df5fd3ce1487ab96f54d53302a6619962763457d;p=xonotic%2Fxonotic-maps.pk3dir.git

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

df5fd3ce1487ab96f54d53302a6619962763457d