Merge branch 'master' of orgmode.org:org-mode
commitdd70cf773ccd1bf1f209cbddca1a0a6616a055d9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 18 Sep 2014 20:09:40 +0000 (18 22:09 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 18 Sep 2014 20:09:40 +0000 (18 22:09 +0200)
treef274c6bd34bcf1c7182319b4b21b7fc3e4802df5
parent80e493a1f7b839525410e6eed940a3b78774d2e1
parente5f61642a3537e531e023cd9e0c729486c40c6af
Merge branch 'master' of orgmode.org:org-mode