Changes

* Applied Ted's patch to my development environment to fix the bug: [https://bugzilla.mozilla.org/show_bug.cgi?id=445560 html pushlog should fold merge changesets into one line], blog post about this soon