Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 9 May 2013 12:27:30 +0000 (14:27 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 9 May 2013 12:27:30 +0000 (14:27 +0200)

Trivial merge