Merge branch 'master' of orgmode.org:org-mode
commit5ac96a45038033070d77230ed64511c0f8064076
authorBastien Guerry <bzg@altern.org>
Mon, 1 Sep 2014 03:09:41 +0000 (1 05:09 +0200)
committerBastien Guerry <bzg@altern.org>
Mon, 1 Sep 2014 03:09:41 +0000 (1 05:09 +0200)
treec3a03327133839f45ceb1b46d2204ffbab51d40c
parent255f060ad07bc65bd929d2a222175ef096914283
parent2df0785fbdcac4e343c9ac801b6c1cfcf3887bbf
Merge branch 'master' of orgmode.org:org-mode