Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org
authorGlenn Morris <rgm@gnu.org>
Thu, 13 Dec 2012 05:29:15 +0000 (21:29 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 13 Dec 2012 05:29:15 +0000 (21:29 -0800)
commit727f97393714c5c92aef793f0749ebfde1d14f3c
tree1bb7d815c7b2a1f1076fa0b0afbdab70045215a0
parentd20704efe62cf45255252168b4f4c453a8c88430
parentbfe6ffb652954956ca984d594deb88d45f8cfd77
Merge from emacs-24; up to 2012-11-30T04:44:52Z!cyd@gnu.org
ChangeLog
Makefile.in
doc/misc/ChangeLog
lisp/ChangeLog
lisp/org/ChangeLog
lisp/org/org-bibtex.el
lisp/progmodes/python.el
src/ChangeLog
src/fileio.c