code.delx.au - gnu-emacs/commit

]> code.delx.au - gnu-emacs/commit

author	Paul Eggert <eggert@cs.ucla.edu>
	Thu, 29 Jan 2015 21:54:51 +0000 (13:54 -0800)
committer	Paul Eggert <eggert@cs.ucla.edu>
	Thu, 29 Jan 2015 21:54:51 +0000 (13:54 -0800)
commit	eadf313c72edcc3a11b9d03032699416efebfe1a
tree	81469c8442f140d2fdc6896e17b15cf3761e1663	tree
parent	7c8b0b3644ada886dfde4032fdf38687a5968089	commit \| diff
parent	ad588afdaa166bcdacbf9f746bd4d39b2c649768	commit \| diff

Merge from origin/emacs-24

ad588af Improve the fix for bug #19701

Conflicts:
src/ChangeLog