From: monad <monadxon@aol.com>
Date: Fri, 30 Aug 2013 12:50:05 +0000 (+0200)
Subject: Merge branch 'master' into monad/zenith
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=91eedcbb775e4f4d4fbd2d671207ef716fef9a79;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into monad/zenith
---

91eedcbb775e4f4d4fbd2d671207ef716fef9a79