Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 6 Aug 2013 11:06:03 +0000 (13:06 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 6 Aug 2013 11:06:03 +0000 (13:06 +0200)

Trivial merge