Merge pull request #13 from electron/master
authorHeilig Benedek <benecene@gmail.com>
Sun, 31 Jul 2016 03:19:43 +0000 (05:19 +0200)
committerGitHub <noreply@github.com>
Sun, 31 Jul 2016 03:19:43 +0000 (05:19 +0200)
commit015516497c31967fcbbc9baea42ebc08eb87e372
tree23c53dba83d41a93a38761dc0cf0a812b3c04c52
parent5118def724d650a95360828c45a572f1d1ee9deb
parenta769996b8d381515f09fbc293e4e576f041e85aa
Merge pull request #13 from electron/master

update as upstream