Merge remote-tracking branch 'origin/mirceakitsune/bloom_tweaks'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 25 Nov 2011 11:20:29 +0000 (12:20 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 25 Nov 2011 11:20:29 +0000 (12:20 +0100)

Trivial merge