Merge branch 'maint'
commitd15cae7e0f6cac490ae8dda050f76e5b8d30079d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 20 Jan 2016 23:54:37 +0000 (21 00:54 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 20 Jan 2016 23:54:37 +0000 (21 00:54 +0100)
tree185767f9f23cc05543d63285333ae18a42bdde57
parent3142d139fac70d060020d3f59f309061705adca4
parent0d53e5f9e85f29a0c0cbdb09283856bfde0b40df
Merge branch 'maint'
lisp/org-colview.el