Merge branch 'maint'
commitcec775fa06733d6047686553da42f4d9847d4a88
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 29 Feb 2016 15:27:19 +0000 (29 16:27 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 29 Feb 2016 15:27:19 +0000 (29 16:27 +0100)
treea66f29eb5b7157f1e59a799e79050506e20cec49
parentb62d55cbb6138ba91d32d7a24f66f6ea6f9a0474
parent2971ab6126882f1a49f72750d9adcbaeb9534b7c
Merge branch 'maint'
lisp/org.el
testing/lisp/test-org.el