Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Wed, 16 Jan 2013 20:03:14 +0000 (21:03 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Wed, 16 Jan 2013 20:03:14 +0000 (21:03 +0100)

Trivial merge