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

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

6e0ac89b3f58dbf7d1b0edc7e62968b5841ee59c