Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 2 Jun 2013 22:06:56 +0000 (00:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 2 Jun 2013 22:06:56 +0000 (00:06 +0200)

Trivial merge