From: Samual <samual@xonotic.org>
Date: Fri, 17 Feb 2012 20:28:00 +0000 (-0500)
Subject: Merge remote branch 'origin/master'
X-Git-Tag: xonotic-v0.6.0~70^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=48ccfb7c43f6d3dbdebbb6c887300ed84ba279f5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master'
---

48ccfb7c43f6d3dbdebbb6c887300ed84ba279f5