From: Samual <samual@xonotic.org>
Date: Sun, 23 Oct 2011 23:55:17 +0000 (-0400)
Subject: Merge remote branch 'origin/samual/cl_autoscreenshot'
X-Git-Tag: xonotic-v0.6.0~40^2~20
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a2d236b2a1dbea22bb6eea20e8e1ac22ad919cd8;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/cl_autoscreenshot'
---

a2d236b2a1dbea22bb6eea20e8e1ac22ad919cd8