Merge branch 'maint'
commit194b7545970e2ba52069deb0b447c54fb7e18a6f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 1 Mar 2016 00:06:02 +0000 (1 01:06 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 1 Mar 2016 00:06:02 +0000 (1 01:06 +0100)
tree14b6a129914196bd2f41e128575cb7d63c7ced0d
parentcec775fa06733d6047686553da42f4d9847d4a88
parent105a44669716abd50377fdcfd03a9a11dc388b16
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el