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

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

b6826c66803dd707da5aac3d481511fc1f79acd7