Merge branch 'master' of orgmode.org:org-mode
commitd46ac5fc1781e924b93f3fb0ed0c82ac9f4a5642
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 5 Sep 2016 22:15:38 +0000 (6 00:15 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 5 Sep 2016 22:15:38 +0000 (6 00:15 +0200)
tree254409368525b856b79f710171b9ccafac05e1af
parent7612fb2b9aed51d0cc83fe4aee156b79e9e473e8
parent7eecb214c7365994594d404439def8932c9babe7
Merge branch 'master' of orgmode.org:org-mode