Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 7 Jul 2013 18:48:35 +0000 (20:48 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 7 Jul 2013 18:48:35 +0000 (20:48 +0200)

Trivial merge