Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Sun, 12 Aug 2012 16:40:26 +0000 (18:40 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Sun, 12 Aug 2012 16:40:26 +0000 (18:40 +0200)

Trivial merge