Merge branch 'maint'
commit93c52908b6263aee22f014b92fa83a3ec0c9e1dc
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 6 Jan 2016 13:46:36 +0000 (6 14:46 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Wed, 6 Jan 2016 13:46:36 +0000 (6 14:46 +0100)
treea935821523f3ac4eb04a73c8a834bf140f918391
parent8e273a3d32b2d2a49bf74668aed6050707401ff1
parent22cf1bf7ed94fef38108c80b0330bfe00f664686
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el