Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 29 Jun 2013 17:08:10 +0000 (19:08 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 29 Jun 2013 17:08:10 +0000 (19:08 +0200)

Trivial merge