Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael.albinus@gmx.de
commit8d3655be5a5c41b1f0a9985bcdb614693fce67e5
authorGlenn Morris <rgm@gnu.org>
Sat, 30 Mar 2013 16:55:47 +0000 (30 09:55 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 30 Mar 2013 16:55:47 +0000 (30 09:55 -0700)
treec213796b69a9d40c6563c211c20ea815754ad560
parent14a581695f7b9c70b8531a41a327a2e01f6125ba
parentb011a6e8011c51e09f28d528a541509c17d4eed0
Merge from emacs-24; up to 2012-12-26T16:22:18Z!michael.albinus@gmx.de
etc/srecode/ede-autoconf.srt
lisp/ChangeLog
lisp/iswitchb.el
lisp/net/tramp.el
lisp/profiler.el
lisp/progmodes/python.el
test/ChangeLog
test/automated/python-tests.el