Merge branch 'maint'
commitbdaf5dacf44c3816c4d1d4ecbd9d3fabff317c3d
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Dec 2017 16:27:53 +0000 (2 17:27 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 2 Dec 2017 16:27:53 +0000 (2 17:27 +0100)
tree8d111e023ca1b9ec692791f76b4167c444db9739
parent0ace32b045cb70c7889eece0cb351217b7fd652a
parentca43c1f262b6e88881b24023b517e5bb4a5b6804
Merge branch 'maint'
lisp/org-table.el
lisp/org.el
testing/lisp/test-org.el