Merge branch 'master' into mirceakitsune/world_cubemaps
authorRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 5 Apr 2012 16:09:50 +0000 (18:09 +0200)

Trivial merge