Merge branch 'master' of orgmode.org:org-mode
commitd6aafd7484c25793cfed37e5e5d32df777e14025
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Nov 2015 08:29:58 +0000 (14 09:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Nov 2015 08:29:58 +0000 (14 09:29 +0100)
tree9e799316dc2534b37cc711e4d696cc1701f5f506
parent5e0efebef8898a1e0c505220e463dd7076a0130a
parente686ab071615c4cf88f9ee29c6cfc381e2448eec
Merge branch 'master' of orgmode.org:org-mode