Merge remote-tracking branch 'refs/remotes/atom/master'
authorPlusb Preco <plusb21@gmail.com>
Sat, 14 Nov 2015 22:58:21 +0000 (07:58 +0900)
committerPlusb Preco <plusb21@gmail.com>
Sat, 14 Nov 2015 22:58:21 +0000 (07:58 +0900)

Trivial merge