Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Wed, 22 May 2013 23:01:19 +0000 (01:01 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 22 May 2013 23:01:19 +0000 (01:01 +0200)

Trivial merge