Merge branch 'maint' master
authorKyle Meyer <kyle@kyleam.com>
Wed, 18 Jan 2017 02:22:11 +0000 (21:22 -0500)
committerKyle Meyer <kyle@kyleam.com>
Wed, 18 Jan 2017 02:22:11 +0000 (21:22 -0500)
1  2 
lisp/org.el
testing/lisp/test-org.el

diff --cc lisp/org.el
Simple merge
Simple merge