From: Samual Lenks <samual@xonotic.org>
Date: Sun, 18 Aug 2013 18:47:02 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=da748c2badc119ef4e608265b92de867f2f97f42;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/master' into terencehill/screenshot_viewer
---

da748c2badc119ef4e608265b92de867f2f97f42