From: terencehill <piuntn@gmail.com>
Date: Sun, 3 Jul 2011 17:33:29 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~36
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=9c1473bb9a9aab5867724bb43524dd6c2b67f911

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

9c1473bb9a9aab5867724bb43524dd6c2b67f911