From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 03:36:12 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/kuniuthefrogg/abyss'
X-Git-Tag: xonotic-v0.7.0~34
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=7bbd23bb323a9841c137b9e74727bf836bbda267

Merge remote-tracking branch 'origin/kuniuthefrogg/abyss'
---

7bbd23bb323a9841c137b9e74727bf836bbda267