Merge branch 'maint'
commitfe9e60d61b91c3186521d7100347413f94a07c34
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 16 Jan 2017 21:27:24 +0000 (16 22:27 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 16 Jan 2017 21:27:24 +0000 (16 22:27 +0100)
treed186605d9791fd5dde11efd414f4d8597a5e6308
parent84de6bab997384da8e6a3f721656c284317848df
parent8c08ee0f8d0de19be5822bc666ed96c4481c87c0
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el