Merge branch 'master' of github.com:WoltLab/WCF
authorAlexander Ebert <ebert@woltlab.com>
Sun, 5 May 2013 17:58:48 +0000 (19:58 +0200)
committerAlexander Ebert <ebert@woltlab.com>
Sun, 5 May 2013 17:58:48 +0000 (19:58 +0200)

Trivial merge