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

Trivial merge