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

Trivial merge