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

Trivial merge