Merge from origin/emacs-24
commit0bb24df135e9c44d2e5a78b58b10719eea9e413b
authorStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:12:00 +0000 (5 15:12 -0500)
committerStefan Monnier <monnier@iro.umontreal.ca>
Fri, 5 Dec 2014 20:12:00 +0000 (5 15:12 -0500)
tree69f9f5c2df0eaefaa0b97dcd3df1d01a7ee28a9b
parentbe307485f722be57985da979296fa37569c2a5a9
parentbb19b229f9c1c32ed8829f14f670bfd9d7ebe2a2
Merge from origin/emacs-24

bb19b22 Python.el: Update commentary on RET-behavior
lisp/progmodes/python.el