Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 15 Oct 2012 08:26:22 +0000 (10:26 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 15 Oct 2012 08:26:22 +0000 (10:26 +0200)

Trivial merge