Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 16 May 2013 19:38:33 +0000 (21:38 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 16 May 2013 19:38:33 +0000 (21:38 +0200)

Trivial merge