smashwilson/merge-conflicts — pull request #89 by smashwilson (2014-11-09 14:18:14+00:00)
Title: [wip] Update deprecated calls.

I haven't touched this for a while and the Atom API has been evolving. Update all of the calls that deprecation cop identifies.