Merge pull request #1 from atom/master
authorHeilig Benedek <benecene@gmail.com>
Fri, 29 Jan 2016 23:14:40 +0000 (00:14 +0100)
committerHeilig Benedek <benecene@gmail.com>
Fri, 29 Jan 2016 23:14:40 +0000 (00:14 +0100)
commite22cb0ca9fe8fcfdc3416d9f7888c932e48f0def
tree01c590a00d9a77090470a8d3f6089442cd0c8f61
parent90064eeddda903f6fd554e2c484e1ec5a86a1e8a
parentd89bda5c68e7e2e5237b25c11f8679333017b612
Merge pull request #1 from atom/master

update as upstream