Merge branch 'maint'
commitf9b501bc18cd189f81919d55203e9a847d1e69f0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Feb 2017 13:19:06 +0000 (23 14:19 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 23 Feb 2017 13:19:06 +0000 (23 14:19 +0100)
treea96a87624490f8b65faa8a8c0232d561d7a7a625
parent83f5c8962fa477baa993214aea4ffd1ffdef8a79
parent4084337dbeb55c682206c8593e9ad5499e73601e
Merge branch 'maint'
lisp/org.el