Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <timwolla@arcor.de>
Mon, 9 Jul 2012 15:41:28 +0000 (17:41 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Mon, 9 Jul 2012 15:41:28 +0000 (17:41 +0200)

Trivial merge