Merge branch 'maint'
commitf6be2b5aa3cb0586b8c9a9bdda923528a9b8f081
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 00:04:13 +0000 (14 02:04 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 14 Aug 2015 00:04:13 +0000 (14 02:04 +0200)
tree4a1763d61cb4a9a06d4f99f762f7fe28062c271e
parentd7c6d92166407ffeb9e53cc2b6d00751662201c2
parenta3eeddefceda0b656994ff19ab4fcfd7e8a099a5
Merge branch 'maint'
lisp/org.el