Merge branch 'maint'
commitadfc9fb4dd10a3503d0a27e1f19e48fd4ba5e83b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 2 Feb 2017 18:54:24 +0000 (2 19:54 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 2 Feb 2017 18:54:24 +0000 (2 19:54 +0100)
treeee02c772939efee5fcd4efcd0bb48ba8b3684ec1
parentf157283c127729c681ac363daa3f411b68da7c3c
parent37bd3586e955e4c2e6eda50aaaf30563288f61f0
Merge branch 'maint'
lisp/org.el