Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 24 Mar 2013 01:58:40 +0000 (02:58 +0100)
committerMarcel Werk <burntime@woltlab.com>
Sun, 24 Mar 2013 01:58:40 +0000 (02:58 +0100)

Trivial merge