Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow
authorMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)
committerMatthias Krüger <matthias.krueger@famsik.de>
Wed, 3 Jul 2013 20:32:21 +0000 (22:32 +0200)

Trivial merge