From: merlijn <mhofstra@gmail.com>
Date: Sat, 25 Aug 2012 11:58:46 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.7.0~52
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=fd313797e4b3fb8ced8f13ad4a42413b7e47e803

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

fd313797e4b3fb8ced8f13ad4a42413b7e47e803