Merge branch 'maint'
commit4d9857f97b1bb4f7237ef1ce5d2602bca6b4fe33
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Jan 2017 22:25:13 +0000 (14 23:25 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 14 Jan 2017 22:25:13 +0000 (14 23:25 +0100)
treeba72c48b76620589052e6d81a00c19a2b31c6806
parent4a878bce4aabd00bf179ae368a6162bf40db3260
parentf0c08e3cbb9a2235a458d7826f4626e501338e0e
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el