Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 29 Apr 2013 19:40:11 +0000 (21:40 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 29 Apr 2013 19:40:11 +0000 (21:40 +0200)

Trivial merge