Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Thu, 27 Jun 2013 17:45:34 +0000 (19:45 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Thu, 27 Jun 2013 17:45:34 +0000 (19:45 +0200)

Trivial merge