Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org
authorGlenn Morris <rgm@gnu.org>
Thu, 21 Feb 2013 16:56:49 +0000 (08:56 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 21 Feb 2013 16:56:49 +0000 (08:56 -0800)
commitcfbf790d80eaa399afceecd9a6c3e2e76bca59b0
treeb2c7ea684fb8d24d5f51d6959aa38854e335d9b6
parentd20e6e9093f74ce2e435a3dac948df200e767405
parent62cfd799f17a31188b3cdb9ffbe1421b4e6cba5d
Merge from emacs-24; up to 2012-12-21T07:35:02Z!ueno@gnu.org
lisp/ChangeLog
lisp/net/tramp.el
lisp/progmodes/python.el
test/ChangeLog