Merge pull request #1 from electron/master
authorchristoth <crstoth@gmail.com>
Tue, 12 Apr 2016 16:38:40 +0000 (12:38 -0400)
committerchristoth <crstoth@gmail.com>
Tue, 12 Apr 2016 16:38:40 +0000 (12:38 -0400)
Update


Trivial merge