Merge branch 'master' of https://github.com/atom/atom-shell
authorCharlie Hess <charlie@slack-corp.com>
Fri, 29 Apr 2016 20:12:56 +0000 (13:12 -0700)
committerCharlie Hess <charlie@slack-corp.com>
Fri, 29 Apr 2016 20:12:56 +0000 (13:12 -0700)

Trivial merge