Merge branch 'maint'
commit522ec9a224381403921c6513b8ee4ee22d4b0bbe
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 18 Nov 2015 22:37:39 +0000 (18 23:37 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 18 Nov 2015 22:37:39 +0000 (18 23:37 +0100)
tree28deda4a06afc19e678e6fe6cbb8dc1ad2cfca6d
parent1aaa0817b68db9c63edeb2b8f78097b9c642d406
parentd537a371be51130b0d9693f4175245648424334a
Merge branch 'maint'
lisp/org-colview.el