From: terencehill <piuntn@gmail.com>
Date: Sun, 18 Dec 2011 15:27:37 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/itemstime
X-Git-Tag: xonotic-v0.8.1~12^2~67
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4239366e87244ca0b02a16d76f4967ef797e03d5;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/itemstime
---

4239366e87244ca0b02a16d76f4967ef797e03d5