Merge branch 'maint'
commita311a856514e9245074b02c89d51a9f339784d1c
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 22 Feb 2016 08:41:25 +0000 (22 09:41 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 22 Feb 2016 08:41:25 +0000 (22 09:41 +0100)
treec8ead8dcd290c3ce422a912287f6cb90e6d098e3
parent2b3c72e231de4bd5f9f1d3ddfeff45c1edd901dd
parent1045e9e9c0e6438f5ee9dc4f0e5c720a8b670cdd
Merge branch 'maint'
lisp/org.el