Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 2 Jun 2013 15:26:35 +0000 (17:26 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 2 Jun 2013 15:26:35 +0000 (17:26 +0200)

Trivial merge