Merge branch 'maint'
commitad685348fd4c0753597ff7855f9513184294c25f
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 14:09:13 +0000 (19 16:09 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 19 Aug 2015 14:09:13 +0000 (19 16:09 +0200)
tree67f284030855346d4457122c6fdedc8b69c38d42
parent3733658bb52ae510780629bd80f82e069bf84865
parentf4d76465be60d50540d1e4366da372308762d76b
Merge branch 'maint'
lisp/org.el