Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 22 Mar 2013 17:13:50 +0000 (18:13 +0100)
committerMarcel Werk <burntime@woltlab.com>
Fri, 22 Mar 2013 17:13:50 +0000 (18:13 +0100)

Trivial merge