change some
change some
Merge branch 'master' of https://github.com/defcool/my.emacs
change some