Merge branch 'maint'
commitfd5323ccee7fdd1525795e14b5dcf6af9a1981d5
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 22 Sep 2016 19:57:17 +0000 (22 21:57 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 22 Sep 2016 19:57:17 +0000 (22 21:57 +0200)
treee354df21faadc08061e84976917f3590ae4f3b1a
parent3dbb74c4f4418aeeef5eb1b6d8f2376eca2b8d90
parent4835befde26f9b432f230165a0c48f9154abba5a
Merge branch 'maint'
contrib/lisp/org-expiry.el