Merge branch 'maint'
commit1c8ed102e9d373ca6276bdc303f90b784c8c3a74
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Jan 2016 13:53:48 +0000 (16 14:53 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 16 Jan 2016 13:53:48 +0000 (16 14:53 +0100)
tree66fe8020649f0937609518bcbb2f59e29d57fca2
parent164555b46ea694cfb141488d8abce15656245bdc
parent6e57a371ff92b47bb0876db853158c1e73d4d586
Merge branch 'maint'
lisp/org-element.el
lisp/org.el
testing/lisp/test-org-element.el