From: merlijn Date: Sat, 23 Jun 2012 12:17:45 +0000 (+0200) Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic X-Git-Tag: xonotic-v0.7.0~54 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c0b656bb97962ba5514d40f5cdd975763fd84f62;p=xonotic%2Fxonotic.git Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic --- c0b656bb97962ba5514d40f5cdd975763fd84f62