Merge from emacs-24
commitd7f413b893012eb5c9c93cd724008c2c1faae56f
authorStefan Monnier <monnier@iro.umontreal.ca>
Thu, 2 Oct 2014 15:13:05 +0000 (2 11:13 -0400)
committerStefan Monnier <monnier@iro.umontreal.ca>
Thu, 2 Oct 2014 15:13:05 +0000 (2 11:13 -0400)
tree4db7c6d5c96996c1f144165e03edb8c06fe0b7be
parent8eb61e5261cebf6a566b1138562953350080156b
parentef9bcf3b409648f36c5745e22d147f50a144524f
Merge from emacs-24
doc/emacs/ChangeLog
lisp/ChangeLog
lisp/emacs-lisp/package.el
lisp/gnus/ChangeLog
lisp/progmodes/python.el
src/ChangeLog
src/xfaces.c
test/ChangeLog
test/automated/package-test.el