Merge branch 'master' of orgmode.org:org-mode
commit5e7ffbe1d4f3529e9f3489c29ce94c4c54aa9f87
authorBastien Guerry <bzg@altern.org>
Fri, 24 Aug 2012 12:23:07 +0000 (24 14:23 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 24 Aug 2012 12:23:07 +0000 (24 14:23 +0200)
treebf674a7110deef130d0d69e3479cf6fd5fd36703
parentbfe3e2102fa656109e6ec04265c41ca3bd15c417
parent8a97c601a14fd8358a5c1e90a1ffbeb9dc6a2e72
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el