Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <timwolla@arcor.de>
Tue, 7 Aug 2012 15:16:52 +0000 (17:16 +0200)
committerTim Düsterhus <timwolla@arcor.de>
Tue, 7 Aug 2012 15:16:52 +0000 (17:16 +0200)

Trivial merge