Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog.
commit6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb
authorBastien Guerry <bzg@gnu.org>
Tue, 8 Jan 2013 15:31:30 +0000 (8 16:31 +0100)
committerBastien Guerry <bzg@gnu.org>
Tue, 8 Jan 2013 15:31:30 +0000 (8 16:31 +0100)
treef9115fbdc6e42a73b57e20a27334057b80275814
parentc7cf0ebc24d66371c8d48ad72f65e72a2a027f06
Merge Org (commit c8c217).  Fix mistake about updating the wrong ChangeLog.
doc/misc/ChangeLog
doc/misc/org.texi
lisp/ChangeLog
lisp/org/ChangeLog
lisp/org/org-src.el
lisp/org/org-version.el