From: cbrutail <ruszkai.akos@gmail.com>
Date: Sat, 19 May 2012 11:00:42 +0000 (+0200)
Subject: Merge branch 'master' into morphed/girder
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=1f4014dd782e25d79d6281cf0f1442a8a6ebf7cf;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into morphed/girder

git merge master
---

1f4014dd782e25d79d6281cf0f1442a8a6ebf7cf