Merge branch 'master' of https://github.com/atom/atom-shell
authorCharlie Hess <charlie@slack-corp.com>
Fri, 15 May 2015 05:37:20 +0000 (22:37 -0700)
committerCharlie Hess <charlie@slack-corp.com>
Fri, 15 May 2015 05:37:20 +0000 (22:37 -0700)

Trivial merge