Merge from emacs-24; up to 2012-12-13T00:52:17Z!yamaoka@jpl.org
authorGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 17:16:30 +0000 (09:16 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 30 Jan 2013 17:16:30 +0000 (09:16 -0800)
commit741d511359a7862a6f7c65da9e2952a1cc8cd92b
tree82eb14584c41c47800782c2233a3492ce30cf5ce
parent1d4e72256b0e35046a70f561a2da3169872feeb1
parentc491dd7037811c143fd453722c48f81c4fece58a
Merge from emacs-24; up to 2012-12-13T00:52:17Z!yamaoka@jpl.org
lisp/ChangeLog
lisp/progmodes/python.el