Fengyuans-MacBook-Air.local Sat Feb 16 15:09:39 CST 2013
don't understand
Merge branch 'master' into darwin
Merge branch 'master' of github.com:chenfengyuan/dotfiles

Conflicts:
	emacs