Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 6 May 2013 12:47:55 +0000 (14:47 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 6 May 2013 12:47:55 +0000 (14:47 +0200)

Trivial merge