Merge pull request #1 from atom/master
authorHeilig Benedek <benecene@gmail.com>
Mon, 5 Oct 2015 16:32:04 +0000 (18:32 +0200)
committerHeilig Benedek <benecene@gmail.com>
Mon, 5 Oct 2015 16:32:04 +0000 (18:32 +0200)
update


Trivial merge