Merge branch 'maint'
authorBastien Guerry <bzg@altern.org>
Sun, 13 Jan 2013 10:17:56 +0000 (11:17 +0100)
committerBastien Guerry <bzg@altern.org>
Sun, 13 Jan 2013 10:17:56 +0000 (11:17 +0100)
commit7369cada30110d602f248c780aab55956ad9f1ae
tree6361912487ff39e89dcb43fdc2ba0cce192c0a9c
parent409ee8a2f27e3fe35b5bf6da6ded22c3da00e1d3
parente8f5b0ad72da990ed7d409c06dbe0bcadeb226dd
Merge branch 'maint'
lisp/org-agenda.el
lisp/org-clock.el
lisp/org-compat.el
lisp/org-id.el
lisp/org-odt.el
lisp/org.el