Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <timwolla@arcor.de>
Thu, 5 Jul 2012 19:58:52 +0000 (21:58 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Thu, 5 Jul 2012 19:58:52 +0000 (21:58 +0200)

Trivial merge