Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Mon, 7 Jan 2013 21:01:36 +0000 (22:01 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Mon, 7 Jan 2013 21:01:36 +0000 (22:01 +0100)

Trivial merge