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

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

b08774794d9db6129258fdf3eb3fda419e7c21f8