Merge branch 'master' of orgmode.org:org-mode
commite24f336cd3a56b3461b4b01bd53fdaa179009a72
authorBastien Guerry <bzg@altern.org>
Fri, 11 Apr 2014 19:33:08 +0000 (11 21:33 +0200)
committerBastien Guerry <bzg@altern.org>
Fri, 11 Apr 2014 19:33:08 +0000 (11 21:33 +0200)
treef48272275b78f35f6ec750cb9bdfc42f5424fc0f
parentb3987ed79e70f0749728835ccaaf296eac1d263c
parent7c82e6ac19a3739abf096511fe2d154fcb0cef3b
Merge branch 'master' of orgmode.org:org-mode
lisp/org.el