Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 12 Dec 2012 15:50:10 +0000 (16:50 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 12 Dec 2012 15:50:10 +0000 (16:50 +0100)

Trivial merge