From: Mario <mario.mario@y7mail.com>
Date: Sat, 4 May 2013 22:01:48 +0000 (+1000)
Subject: Merge branch 'master' into Mario/lms_updates
X-Git-Tag: xonotic-v0.7.0~60^2~5
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=93735d2e627b843f01841ec565221aa3854a2e6a

Merge branch 'master' into Mario/lms_updates
---

93735d2e627b843f01841ec565221aa3854a2e6a