commit 87e1925b918505ebde4dc868388100a1a52fa803
Merge: ff675e3 df4e0de
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 11:41:07 2012 -0700

    Merge pull request #367 from darkwing/styles-update-771645

    fix but 771645 - Adding custom stylesheet to iframe page

commit df4e0deaa1b1260d5cc8664cd9539ca127e5916c
Author: David Walsh <dwalsh@mozilla.com>
Date:   Mon Jul 9 13:36:21 2012 -0500

    fix but 771645 - Adding custom stylesheet to iframe page

commit ff675e3fb3771153febcc9a2d3434bfb12d8e197
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 14:02:59 2012 -0400

    Tweak to file attachment redirect test to use normal Client

commit e0a0dc50e286b84d06ab8c9a756131256070b735
Author: Les Orchard <me@lmorchard.com>
Date:   Mon Jul 9 13:50:52 2012 -0400

    Add @api to SUPPORTED_NONLOCALES for file attachments

commit ac714f37a03bd9d43654ee701fde8e22257e8dc7
Author: James Bennett <james@b-list.org>
Date:   Mon Jul 9 12:11:02 2012 -0500

    Correct version of migration script, with live DB-writing.

commit cb85765bd2251c6b7610ff21c550f86895ab9712
Author: James Bennett <james@b-list.org>
Date:   Mon Jul 9 10:22:48 2012 -0500

    MindTouch-to-kuma file migration script.

    Does what it says on the tin: adds '--files' to the list of
    command-line flags for the migration script, and does everything in
    its power to migrate files and their revisions into kuma's
    file-handling infrastructure.

    Currently, on a somewhat dated snapshot of the DB and files, it misses
    three revisions.