Merge branch 'maint'
commit93143802846fccd872b95b601ddab509737b01b0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Apr 2016 07:18:00 +0000 (14 09:18 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Thu, 14 Apr 2016 07:18:00 +0000 (14 09:18 +0200)
treec52201139b1e0f78fc986fb78598d27717a12b0d
parent3135d242394082c60c89a7941b8ba510a95264de
parent846467b7185876583d58ee2156bcaaa91832f32a
Merge branch 'maint'
lisp/org.el