4 commits

Author	SHA1	Message	Date
Paul Eggert	7e09ef09a4	Update copyright year to 2015 ... Run admin/update-copyright.	2015-01-01 14:26:41 -08:00
Stefan Monnier	fca389d1d3	Merge from emacs-24	2014-12-05 15:20:02 -05:00
Paul Eggert	dbff8fd118	Spelling fix.	2014-11-28 23:55:17 -08:00
David Engster	f42adad94b	admin: Add gitmerge.el ... * gitmerge.el: New file.	2014-11-27 18:22:00 +01:00