Merge branch 'master' of orgmode.org:org-mode
commit988240d5fd7a27678824690cf741ccbaf1da923a
authorBastien Guerry <bzg@altern.org>
Mon, 25 Feb 2013 10:21:25 +0000 (25 11:21 +0100)
committerBastien Guerry <bzg@altern.org>
Mon, 25 Feb 2013 10:21:25 +0000 (25 11:21 +0100)
tree3404bc9998e21ecfba5dd1768e81868c7309ffd7
parent662cb9868474b01da31413fd034111373e662edb
parent87c553d268817b5bc917b5c15d2b9cc07d6fbb07
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el