Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 13 Apr 2013 21:08:46 +0000 (23:08 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 13 Apr 2013 21:08:46 +0000 (23:08 +0200)

Trivial merge