clean
Merge branch 'master' of github.com:zhongsheng/.emacs.d

Conflicts:
	ac-comphist.dat
clear