Merge branch 'maint'master
commitd854c18c4eca0b558235328345b6deb8012f24cd
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 4 Sep 2015 19:31:28 +0000 (4 21:31 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 4 Sep 2015 19:31:28 +0000 (4 21:31 +0200)
treed2028fdc65ad5267e1ff4cd1802072c6db74547a
parentb5fe5b88db8e68bfd89eca44ef35fd023802749a
parenta2662dc3657118ab01814125695c2ac09589114e
Merge branch 'maint'
lisp/org.el