Merge branch 'maint'
commit44db364c69384f0f0cbfbe11241d6eb1f9258328
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 25 Feb 2016 14:11:02 +0000 (25 15:11 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 25 Feb 2016 14:11:02 +0000 (25 15:11 +0100)
tree3ebd47365d631f9af61bbed7de76192902d5cd56
parent0f3cb188a9c76dc3207a08ab498e6d5814eeadc6
parent642c50f0cb371d698e57fd540d824920aa770cb8
Merge branch 'maint'
lisp/org.el