Merge pull request #9 from electron/master
authorHeilig Benedek <benecene@gmail.com>
Fri, 3 Jun 2016 13:35:12 +0000 (15:35 +0200)
committerHeilig Benedek <benecene@gmail.com>
Fri, 3 Jun 2016 13:35:12 +0000 (15:35 +0200)
commit9aaa6c7a8fdfc46d5bdc7f49924a6213ba2201e4
treec499f1c552e6f4c7d01e4e97a17afac87bccca86
parent1282d6eedb60fae1bc1333ed1a25dee19603b0b9
parent9d55424c482e5054aaf67dd927534e9fe64b1fb7
Merge pull request #9 from electron/master

update as upstream