From: terencehill <piuntn@gmail.com>
Date: Sat, 9 Apr 2011 17:34:08 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~46
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f75b40eeb1ba7aee59806ef1f1cf1d75e4f857e;p=xonotic%2Fxonotic-data.pk3dir.git

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

6f75b40eeb1ba7aee59806ef1f1cf1d75e4f857e