From: terencehill <piuntn@gmail.com>
Date: Wed, 18 Aug 2010 22:44:23 +0000 (+0200)
Subject: Merge remote branch 'remotes/origin/terencehill/screenshot_viewer' into terencehill... 
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~55
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=4a0015db18b4cb3473d73762e2ef1275a3a0bc38;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'remotes/origin/terencehill/screenshot_viewer' into terencehill/screenshot_viewer
---

4a0015db18b4cb3473d73762e2ef1275a3a0bc38