Merge branch 'master' of https://github.com/atom/electron
author大和屋 貴仁 <t.yamatoya@gloops.com>
Mon, 11 Jan 2016 05:12:43 +0000 (14:12 +0900)
committer大和屋 貴仁 <t.yamatoya@gloops.com>
Mon, 11 Jan 2016 05:12:43 +0000 (14:12 +0900)

Trivial merge