Merge branch 'maint'
commit4bb5306f2ded54387de825b7c32e11798498f443
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Aug 2015 00:44:02 +0000 (13 02:44 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 13 Aug 2015 00:44:02 +0000 (13 02:44 +0200)
treed9d7c22a4968edcfc424a05cde52339f28277697
parent0461101fbbb75c4e7942306ce66032122cf3ab0b
parent4dc79cbe9d0a4403d590ffda2480df31009f5d6f
Merge branch 'maint'
lisp/org.el