Merge branch 'maint'
commit1daac70fc5717f6393168ce3ffcea400275e17c9
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 26 Apr 2016 19:03:45 +0000 (26 21:03 +0200)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Tue, 26 Apr 2016 19:03:45 +0000 (26 21:03 +0200)
tree166e2cc4e2c504b1d25bbd9a8163772e78b24bc1
parentce748a7ed5fd7b9b57c0a0e8cdcc65a28c8ee06a
parente818699113218081967eaf7e10427a7d70f7fbd2
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el