Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 10 Jan 2013 17:18:49 +0000 (18:18 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 10 Jan 2013 17:18:49 +0000 (18:18 +0100)

Trivial merge