From: merlijn <mhofstra@gmail.com>
Date: Sun, 20 May 2012 16:44:13 +0000 (+0200)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.7.0~55
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=1f5d74bfbf3e6e79e72d81fdd3d2dd39caef6398

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

1f5d74bfbf3e6e79e72d81fdd3d2dd39caef6398