Merge branch 'maint'
commit1c7cf61bd78a51c2804ca3f7caf65cd874c271c7
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 14 Jun 2017 09:03:40 +0000 (14 11:03 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 14 Jun 2017 09:03:40 +0000 (14 11:03 +0200)
treee17808d8073ee648c84ccb59a88615e8c8907c07
parentd8eaa8396dfc580bd0663248b3ae411904c17a8c
parentb47920ed208119a0a9de307b1839a4aed54572ef
Merge branch 'maint'
lisp/org-colview.el
lisp/org.el
testing/lisp/test-org-colview.el