Merge remote-tracking branch 'atom/master'
authorPlusb Preco <plusb21@gmail.com>
Tue, 15 Sep 2015 00:50:11 +0000 (09:50 +0900)
committerPlusb Preco <plusb21@gmail.com>
Tue, 15 Sep 2015 00:50:11 +0000 (09:50 +0900)

Trivial merge