Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 4 Jan 2013 16:31:02 +0000 (17:31 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 4 Jan 2013 16:31:02 +0000 (17:31 +0100)

Trivial merge