Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 7 Aug 2012 22:10:54 +0000 (00:10 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 7 Aug 2012 22:10:54 +0000 (00:10 +0200)

Trivial merge