Merge branch 'master' of https://github.com/atom/electron into better-translations
authorMario Zaizar <mariozaizar@gmail.com>
Fri, 9 Oct 2015 15:58:07 +0000 (08:58 -0700)
committerMario Zaizar <mariozaizar@gmail.com>
Fri, 9 Oct 2015 15:58:07 +0000 (08:58 -0700)
commit1e13159157e1615a32d7c7716ef364d15b4e8963
treeaecb12acc288a2f82a1668f8c09d3bf6c9167072
parent28b3678159ba4e987bc1c6c86c216747cff4ca0c
parent215ca78c7fc0c396397555692beac9adbd97c6e8
Merge branch 'master' of https://github.com/atom/electron into better-translations