Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Tue, 23 Jul 2013 11:15:27 +0000 (13:15 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Tue, 23 Jul 2013 11:15:27 +0000 (13:15 +0200)

Trivial merge