Merge branch 'maint'
commita8a60cc7f79b7dbadad0dc5cd2362017e45973dc
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 12:08:14 +0000 (21 14:08 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Aug 2015 12:08:14 +0000 (21 14:08 +0200)
tree7089280be38b07d111e80979eec5501ffe090ae1
parent5f217e6fd59a384a15ae7ccff896b639b6b6e6fb
parent183348cda52e8898c19487d2f86c1318605234bd
Merge branch 'maint'
lisp/org.el