Merge remote branch 'origin/master' into tzork/turrets-csqc
authorJakob MG <jakob_mg@hotmail.com>
Sun, 19 Jun 2011 14:28:20 +0000 (16:28 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Sun, 19 Jun 2011 14:28:20 +0000 (16:28 +0200)

Trivial merge