Merge branch 'maint'
commit0620fe98cbbe1d145af010ac003b4741406fb122
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Sep 2014 19:03:27 +0000 (19 21:03 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 19 Sep 2014 19:03:27 +0000 (19 21:03 +0200)
tree61d20755d0be05bf1999ec3fe2aa4ff686f70cd5
parent5bb58daa2259d14d86379af524fd7736d1187518
parent3f484a52775c8873a3b1b44e8264e01369850a8a
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el