Merge branch 'maint'
commit5792667bde749ce89bbc8fb5fcd1ba148b22d631
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 6 Jan 2016 13:51:04 +0000 (6 14:51 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 6 Jan 2016 13:51:04 +0000 (6 14:51 +0100)
tree3e19f2e23cc917c22bc7fc4b2dbc6d57b2fbb78b
parent93c52908b6263aee22f014b92fa83a3ec0c9e1dc
parent005f8b2fd1004b3667a35b73a24d5b384c692063
Merge branch 'maint'
lisp/org.el