Merge branch 'maint' of orgmode.org:org-mode into maint
commitc3c33841ebb2e63867be83a4ce589505cccb64c4
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Nov 2016 22:08:33 +0000 (19 23:08 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 19 Nov 2016 22:08:33 +0000 (19 23:08 +0100)
treec0ba8ba71208422b3992435cf346edd3ddbdf7a3
parent9e2dc98eef29fd4022d9793c60f32965ebeb5e94
parentd31c8ef17c171ec32143d01fd6e6bebf6a96cd4d
Merge branch 'maint' of orgmode.org:org-mode into maint