From: merlijn <mhofstra@gmail.com>
Date: Sat, 21 Jul 2012 12:15:52 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.7.0~53
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a82fc1ffb87035c094fa9935bdab290e89c39e5b;p=xonotic%2Fxonotic.git

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

a82fc1ffb87035c094fa9935bdab290e89c39e5b