Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Mon, 18 Mar 2013 17:03:21 +0000 (18:03 +0100)
committerMarcel Werk <burntime@woltlab.com>
Mon, 18 Mar 2013 17:03:21 +0000 (18:03 +0100)

Trivial merge