From: terencehill <piuntn@gmail.com>
Date: Mon, 15 Aug 2011 11:09:23 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c124ca87a28c2cbf69835e8ca2549baf9b872609;p=xonotic%2Fxonotic-data.pk3dir.git

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

c124ca87a28c2cbf69835e8ca2549baf9b872609