Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 18 May 2013 22:22:31 +0000 (00:22 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 18 May 2013 22:22:31 +0000 (00:22 +0200)

Trivial merge