Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Tue, 23 Apr 2013 12:38:39 +0000 (14:38 +0200)
committerMarcel Werk <burntime@woltlab.com>
Tue, 23 Apr 2013 12:38:39 +0000 (14:38 +0200)

Trivial merge