Merge branch 'maint'
commit52a327e4e54d5c1743d89a7aa24fabbb1874e5dc
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 27 Apr 2017 22:24:46 +0000 (28 00:24 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 27 Apr 2017 22:24:46 +0000 (28 00:24 +0200)
tree462f6bb8bd7fe31d64369e5f20d26419249796a3
parent32e1ca29335ee12ce8317c19b4d388d97e1ac74c
parent8dfcdedf44be4af8eb8ede1204d0863ea2b39b46
Merge branch 'maint'
lisp/org-colview.el