Merge branch 'maint'
commitb8a67993f9e5497427b76e7eb6b25394a87edd4b
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Jan 2016 12:57:25 +0000 (25 13:57 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Mon, 25 Jan 2016 12:57:25 +0000 (25 13:57 +0100)
tree623acd617460274e9c6d2807cf3474b3cb8d4cf2
parent0c3ea42a7c65c3f2debdf36a6c99ffde299b6e25
parent9eface25da489cbb7b8c2f4951850b571f74f660
Merge branch 'maint'
lisp/org.el