Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 28 Mar 2013 12:14:34 +0000 (13:14 +0100)
committerMarcel Werk <burntime@woltlab.com>
Thu, 28 Mar 2013 12:14:34 +0000 (13:14 +0100)

Trivial merge