Merge branch 'maint'
commitf3642291765229babca4b538e1806c3473df97a0
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 24 Jun 2016 07:22:00 +0000 (24 09:22 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 24 Jun 2016 07:22:00 +0000 (24 09:22 +0200)
tree9ceb2a5adb0d8813eea244d06386997adb16d20b
parentbffa144f540471983bc77b1dad433f105571cef6
parent0d72c3493782e418a4aab8ce6f3cb552fdb089e5
Merge branch 'maint'
lisp/org.el