Merge branch 'maint'
commit12e59b66d13b488b3ba9a71d72c1468c3f20762b
authorAchim Gratz <Stromeko@Stromeko.DE>
Sun, 7 Oct 2012 16:13:06 +0000 (7 18:13 +0200)
committerAchim Gratz <Stromeko@Stromeko.DE>
Sun, 7 Oct 2012 16:13:06 +0000 (7 18:13 +0200)
treef887d891f19bf66a600bf2243f9293935f6d5230
parent956858a39562c2272807704ef128258804ce45a0
parent93f4b7c6d854e34d77632492588dd44526f44989
Merge branch 'maint'
contrib/lisp/org-e-odt.el
lisp/org.el