Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 30 Jun 2013 14:16:28 +0000 (16:16 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 30 Jun 2013 14:16:28 +0000 (16:16 +0200)

Trivial merge