Merge branch 'master' of github.com:WoltLab/WCF
authorMarcel Werk <burntime@woltlab.com>
Thu, 27 Jun 2013 17:37:47 +0000 (19:37 +0200)
committerMarcel Werk <burntime@woltlab.com>
Thu, 27 Jun 2013 17:37:47 +0000 (19:37 +0200)

Trivial merge