Merge branch 'maint'
commit2e13d33baa652153b9172f5eb8633c033c686128
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 26 Aug 2015 20:23:23 +0000 (26 22:23 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 26 Aug 2015 20:23:23 +0000 (26 22:23 +0200)
tree3d78be3368e6c99e8ba575c77d0ba637882ed3f5
parent0fa05a60eb546373bf5a62d9a2e1ba318d316316
parentaf0704b4d54fd83bcf819492fedef69def8d03e9
Merge branch 'maint'
lisp/org.el