todoroo/astrid — pull request #166 by sbosley (2012-03-20 01:04:46+00:00)
Title: Resolve sync conflicts by choosing side with more recently modified

I think this is ready for testing and I'd be fine pushing it to master, but I wanted to give you the chance to code review.