Ivan Malison 27ec88c43e Merge remote-tracking branch 'origin/master' into yelp
Conflicts:
	elpa/find-file-in-project-3.2/find-file-in-project.el
	init.el
	lisp/emacs-testify
2013-07-18 20:26:45 -07:00
..
2013-04-10 15:43:11 -07:00
2013-03-16 20:10:33 -07:00
2013-03-24 12:56:49 -07:00
2013-03-16 20:10:33 -07:00
2013-03-16 20:10:33 -07:00
2013-03-24 12:56:49 -07:00
2013-03-24 12:56:49 -07:00
2013-04-10 15:43:11 -07:00