Merge branch 'master' of https://github.com/electron/electron into restore-issue
authorliusi <siyuan.liu@autodesk.com>
Mon, 25 Jul 2016 14:53:18 +0000 (22:53 +0800)
committerliusi <siyuan.liu@autodesk.com>
Mon, 25 Jul 2016 14:53:18 +0000 (22:53 +0800)
commit8129c27a4a5e79e02d12046f98499ab68b3b6d02
treea71d9cdc9a19013240641ce03a3120c903b3781f
parent2cc01eea30f1694758942d72ccd17ddac5765258
parent729b84f2cad6818b7397f39e77c6e6a7011aa3a1
Merge branch 'master' of https://github.com/electron/electron into restore-issue