Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 8 Aug 2012 16:39:52 +0000 (18:39 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 8 Aug 2012 16:39:52 +0000 (18:39 +0200)

Trivial merge