Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 15 Apr 2013 18:48:48 +0000 (20:48 +0200)
committerMarcel Werk <burntime@woltlab.com>
Mon, 15 Apr 2013 18:48:48 +0000 (20:48 +0200)

Trivial merge