Merge branch 'maint'
commit79957188e0cd0bfcb4a3329e0875dc52d238e861
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 5 Feb 2016 17:36:39 +0000 (5 18:36 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 5 Feb 2016 17:36:39 +0000 (5 18:36 +0100)
tree805cd173d6feb56231a744323db1583ef3252181
parent8a293ac999974326c0062c8799836e8d4bd4cee6
parent6418173b97a260c0c76b527dc052589b9ebda1fb
Merge branch 'maint'
lisp/org.el