Merge branch 'master' of github.com:WoltLab/WCF
authorTim Düsterhus <duesterhus@woltlab.com>
Thu, 13 Sep 2012 21:05:47 +0000 (23:05 +0200)
committerTim Düsterhus <duesterhus@woltlab.com>
Thu, 13 Sep 2012 21:05:47 +0000 (23:05 +0200)

Trivial merge