Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 25 May 2013 14:30:40 +0000 (16:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 25 May 2013 14:30:40 +0000 (16:30 +0200)

Trivial merge