Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Sat, 27 Apr 2013 23:53:12 +0000 (01:53 +0200)
committerMarcel Werk <burntime@woltlab.com>
Sat, 27 Apr 2013 23:53:12 +0000 (01:53 +0200)

Trivial merge