Merge branch 'maint'
commitff236e5c85a76a93b33130217e8e22f63617ba6b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Mar 2016 13:36:16 +0000 (30 15:36 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 30 Mar 2016 13:36:16 +0000 (30 15:36 +0200)
tree655e4af3b053b7a2cc8ea6ea026b7d370dce3a75
parent18b7661a8481e59a6b3c12335ae06bc8166d6542
parent954103dd9b21c6de5d6d9ea638ebb7cd8b5db016
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el