Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 14 May 2013 22:47:43 +0000 (00:47 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 14 May 2013 22:47:43 +0000 (00:47 +0200)

Trivial merge