Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sun, 14 Apr 2013 13:19:54 +0000 (15:19 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sun, 14 Apr 2013 13:19:54 +0000 (15:19 +0200)

Trivial merge