Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 16 Nov 2012 17:22:39 +0000 (18:22 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 16 Nov 2012 17:22:39 +0000 (18:22 +0100)

Trivial merge