Merge branch 'maint'
commitcd9cccb4b28806c4af05fdc192a1babeb75bed22
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 18 Oct 2017 20:49:10 +0000 (18 22:49 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 18 Oct 2017 20:49:10 +0000 (18 22:49 +0200)
tree7daf7d7fd92ad91e7e2c91000f247d1d53220a35
parent52d4ca4b29b4e404f797130d56fec4793aed83d2
parent8c5c030c646941d057ef76e7845e3503d3fdf3a8
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el