Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Fri, 9 Nov 2012 15:45:49 +0000 (16:45 +0100)
committerTim Düsterhus <duesterhus@woltlab.com>
Fri, 9 Nov 2012 15:45:49 +0000 (16:45 +0100)

Trivial merge