Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Tue, 9 Oct 2012 16:29:54 +0000 (18:29 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Tue, 9 Oct 2012 16:29:54 +0000 (18:29 +0200)

Trivial merge