From: merlijn <mhofstra@gmail.com>
Date: Tue, 14 Jun 2011 06:53:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/diabolik/afterslime'
X-Git-Tag: xonotic-v0.5.0~98^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7952e74e951e659a1721bc8e2ddff421947132f8;p=xonotic%2Fxonotic-maps.pk3dir.git

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

7952e74e951e659a1721bc8e2ddff421947132f8