Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 20 May 2013 22:23:36 +0000 (00:23 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 20 May 2013 22:23:36 +0000 (00:23 +0200)

Trivial merge