Merge branch 'master' of https://github.com/renatoalencar/electron
authorRenato Alencar <renatoalencar.73@gmail.com>
Wed, 7 Oct 2015 17:13:27 +0000 (14:13 -0300)
committerRenato Alencar <renatoalencar.73@gmail.com>
Wed, 7 Oct 2015 17:13:27 +0000 (14:13 -0300)

Trivial merge