From: terencehill <piuntn@gmail.com>
Date: Sun, 5 Jun 2011 22:40:03 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2cfe4d2a43258696d11a18cd4284bba70304ce54;p=xonotic%2Fxonotic-data.pk3dir.git

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

2cfe4d2a43258696d11a18cd4284bba70304ce54