Merge branch 'maint' of orgmode.org:org-mode into maint
commit0fda6465aff3e672778bb6aad717bde1e6af24d0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Mar 2017 11:52:40 +0000 (27 13:52 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 27 Mar 2017 11:52:40 +0000 (27 13:52 +0200)
treeb61bbb9ea2c96279ff74bfaadd56af5dc250b3b3
parent7648354952892d061f626b7a8844f791b2dfe4af
parent7839fb891b5b5145104da016b8be6b439ffff806
Merge branch 'maint' of orgmode.org:org-mode into maint