Merge branch 'master' of orgmode.org:org-mode
commitabcbbd4f30448de1055fcc9fdf2e7c25539cb8eb
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 14 Dec 2014 17:28:18 +0000 (14 18:28 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 14 Dec 2014 17:28:18 +0000 (14 18:28 +0100)
treeb9f7ecbe73b8f9bcb1930697103c8e3d6d59a9a3
parente990bedc51f8488fb39961e06cfbe883429a33ea
parent965f700bd995766f57a53c3c58c3390c101678e6
Merge branch 'master' of orgmode.org:org-mode