Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca
authorGlenn Morris <rgm@gnu.org>
Fri, 25 Jan 2013 04:41:39 +0000 (20:41 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 25 Jan 2013 04:41:39 +0000 (20:41 -0800)
commit830e46e61ba1316e771c72a15e709d3d12e150b7
treec88c21c32f65dc77d8f76c315a41a519a585dc8f
parent3d4147bae3f03502acb3d12a5c9747129cc0c6aa
parent345f866e048bdc11bc38d894a7eaaa47335443e2
Merge from emacs-24; up to 2012-12-11T18:52:31Z!monnier@iro.umontreal.ca
lisp/ChangeLog
lisp/imenu.el
lisp/profiler.el
lisp/progmodes/python.el
src/ChangeLog
src/coding.c
src/w32.c