Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Fri, 3 May 2013 14:48:25 +0000 (16:48 +0200)
committerMarcel Werk <burntime@woltlab.com>
Fri, 3 May 2013 14:48:25 +0000 (16:48 +0200)

Trivial merge