Merge remote-tracking branch 'origin/divVerent/xoylent_sRGB'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 14:57:26 +0000 (16:57 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 11 Oct 2013 14:57:26 +0000 (16:57 +0200)

Trivial merge