atom/atom — pull request #2115 by strobemute (2014-05-09 06:17:20+00:00)
Title: Merge pull request #1 from atom/master

Merge