Merge branch 'maint'
commit19460418a03a89b6eeadfc95726bf4d6a77a9e91
authorAchim Gratz <Stromeko@Stromeko.DE>
Sun, 6 Jan 2013 17:33:16 +0000 (6 18:33 +0100)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sun, 6 Jan 2013 17:33:16 +0000 (6 18:33 +0100)
tree335b61fefa1e15e9d2d8787b706e9094e2476303
parentb43ee80cb860c2bd1a78271eba58fa6e4a99ef49
parent305f29776fba57cdd1566071e0e8a75270d095c6
Merge branch 'maint'
contrib/lisp/org-e-odt.el
lisp/org-agenda.el
lisp/org-clock.el
lisp/org.el