Merge branch 'maint'
commit0be422187fbb362ba81c14964227edef56c23f21
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 15 Apr 2017 15:28:04 +0000 (15 17:28 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 15 Apr 2017 15:28:04 +0000 (15 17:28 +0200)
tree7d9afd747674a79a0e4643fde8a36520c2f24d9c
parent42f24c167c3fb156a2fed7daf485640063526245
parent8a2ffac88ae697ddd835da1db1de03bb0162c4c0
Merge branch 'maint'
lisp/org-element.el
testing/lisp/test-org-element.el