auto
Merge branch 'master' of github.com:yangyingchao/tubo-env

Conflicts:
	.emacs.d/rc/04-rc-other-modes.el
	.emacs.d/site-lisp/Makefile