Merge branch 'maint'
commit3add787abd01efcca029d65e97f828823205286a
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 17:12:49 +0000 (11 19:12 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 11 Aug 2015 17:12:49 +0000 (11 19:12 +0200)
tree65c63619d9f9c566f0f70b89dea44b20cdf02a44
parent05994dc775ef1ac1524ef4c3d18a3deb9064e9c4
parent6116c72975c0ff8c4cd5d7998b206097800289fe
Merge branch 'maint'
lisp/org.el