Merge branch 'master' of orgmode.org:org-mode
commit3ee229dcd165a4e7c0f49d52c13431dfaac1364b
authorBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 17:21:40 +0000 (26 18:21 +0100)
committerBastien Guerry <bzg@altern.org>
Tue, 26 Feb 2013 17:21:40 +0000 (26 18:21 +0100)
tree5eff8915841ca94da23b1ff63e40c4af2c4d6534
parent295b0ba5d1e0e370211de6e50829d9291cacedf4
parentff92e688dd78c0a52c9fe353b427b6e7ad5a8c46
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el