Merge branch 'maint'
commit6ed60a797a844b204080daf4ee36f27811ee98ee
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 28 Apr 2016 20:08:01 +0000 (28 22:08 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 28 Apr 2016 20:08:01 +0000 (28 22:08 +0200)
treed6e600239d742271713d795190aed2c2e66530b2
parentec615b192d703a0201ceefd46897e4636ff00a38
parentc8c2d2b1f715158a1f55a7eaf4797c78562b4402
Merge branch 'maint'
lisp/org.el