mozilla/kuma — pull request #59 by lmorchard (2011-11-24 02:05:20+00:00)
Title: 702988 master to mdn rebase

NOT FOR MERGE. (probably for discarding, though)

For the hell of it, I redid the merge as a rebase instead and cherrypicked over the tweaks I did to get tests passing.

Pros: It cuts down on all the merge commits
Cons: There's no single commit to peek at and see everything I did to resolve conflicts, since rebase had me make the fixes along the way