Merge branch 'maint'
commiteda4684d35b63a5561c31dad157c527303d14368
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 22 Jan 2017 13:29:05 +0000 (22 14:29 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sun, 22 Jan 2017 13:29:05 +0000 (22 14:29 +0100)
treeb79efe33ca9e360df3c09ab6f3e993d67529a8bf
parent9dafef9fa84057b3938863062581563b6e22af49
parent12a23d6c61ce04695e8d967e96843f94823df78b
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el