From: merlijn <mhofstra@gmail.com>
Date: Mon, 23 May 2011 20:04:46 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/diabolik/afterslime'
X-Git-Tag: xonotic-v0.5.0~98^2~18^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=14bb545314ad957e7108386227a74a208d35cfaa;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge remote-tracking branch 'origin/diabolik/afterslime'
---

14bb545314ad957e7108386227a74a208d35cfaa