Merge from emacs-24; up to 2012-12-27T20:09:45Z!juri@jurta.org
authorGlenn Morris <rgm@gnu.org>
Sat, 1 Jun 2013 20:21:22 +0000 (13:21 -0700)
committerGlenn Morris <rgm@gnu.org>
Sat, 1 Jun 2013 20:21:22 +0000 (13:21 -0700)
commitf46305c86cd247b2396e73ce8bb064f69373834d
treee4eea4ee7548f8f16035d52ea13f040aef2cba1e
parent9133b82e6f850b96eeb8c1e2c62fbeb52f111673
parent20992a85041ddd8c2852eaef24fe69f9a47019a2
Merge from emacs-24; up to 2012-12-27T20:09:45Z!juri@jurta.org
doc/emacs/ChangeLog
lisp/ChangeLog
lisp/progmodes/python.el