Merge branch 'master' of orgmode.org:org-mode
commit977412f468ea2e7eea2e8a68729fe8c1a478eb06
authorBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 13:29:36 +0000 (13 14:29 +0100)
committerBastien Guerry <bzg@altern.org>
Wed, 13 Feb 2013 13:29:36 +0000 (13 14:29 +0100)
treedd9a74a24dea3c2d85d8202f45a42e886484eb08
parent03f1cffcd5db94c0b2dd90ef5ae22f1a3e764b5e
parent88925e2e0b19880a399533e16b85a0aaf73f9ff6
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el