From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 14 Aug 2011 14:59:07 +0000 (+0200)
Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
X-Git-Tag: xonotic-v0.5.0~56
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-maps.pk3dir.git;a=commitdiff_plain;h=76d4fceb1fd14b4ab567db2f91da3e420b883704;hp=76d4fceb1fd14b4ab567db2f91da3e420b883704

Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-maps.pk3dir
---