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

Trivial merge