Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 29 May 2013 12:33:40 +0000 (14:33 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 29 May 2013 12:33:40 +0000 (14:33 +0200)

Trivial merge