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

Trivial merge