Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Sat, 5 Jan 2013 13:04:40 +0000 (14:04 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Sat, 5 Jan 2013 13:04:40 +0000 (14:04 +0100)

Trivial merge