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

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

7eef36cbbaf662a56fac50ad0dc81cc0bf07b017