From: Mirio <opivy@hotmail.de>
Date: Mon, 31 Aug 2015 12:09:37 +0000 (+0200)
Subject: Merge branch 'master' into matthiaskrgr/srgb
X-Git-Tag: xonotic-v0.8.2~181^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e89a82f82bd6519cff0084cfe1fd028a47bd3fd0;p=xonotic%2Fxonotic-maps.pk3dir.git

Merge branch 'master' into matthiaskrgr/srgb
---

e89a82f82bd6519cff0084cfe1fd028a47bd3fd0