Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 2 Jun 2013 18:02:11 +0000 (20:02 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 2 Jun 2013 18:02:11 +0000 (20:02 +0200)

Trivial merge