Merge branch 'master' of orgmode.org:org-mode
commit6ee775383b841bf1df310feee6c61f1f83915ebd
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 4 Aug 2015 17:43:36 +0000 (4 19:43 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 4 Aug 2015 17:43:36 +0000 (4 19:43 +0200)
tree8d79ce212afdd1f772d5fa1122361d49b1c8bff1
parent6164413f38e974d8ba13f0109f5b201c30b506a4
parentaf359557810fd574a0f9163c18380f2be91396d4
Merge branch 'master' of orgmode.org:org-mode