Merge branch 'maint'
commit61db4483f8fb7e171117550055ff1d10fc730c77
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Jan 2016 12:58:28 +0000 (25 13:58 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Jan 2016 12:58:28 +0000 (25 13:58 +0100)
treecdadbb1f509646c0dba8bac75693b0c79e88d497
parentb8a67993f9e5497427b76e7eb6b25394a87edd4b
parent73c59ca4ff212d0e3d38ea6bca05f5baa52136c0
Merge branch 'maint'
lisp/org.el