Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 14 Jul 2013 21:38:50 +0000 (23:38 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 14 Jul 2013 21:38:50 +0000 (23:38 +0200)

Trivial merge