Merge remote-tracking branch 'refs/remotes/atom/master'

This commit is contained in:
Plusb Preco 2015-11-04 10:50:33 +09:00
commit df5a3d4e68