From: terencehill <piuntn@gmail.com>
Date: Wed, 21 Dec 2011 20:21:05 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/itemstime
X-Git-Tag: xonotic-v0.8.1~12^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5de7b43dff82c520a331692fbfead74a5beb880c;p=xonotic%2Fxonotic-data.pk3dir.git

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

5de7b43dff82c520a331692fbfead74a5beb880c