Merge branch 'maint' master
authorKyle Meyer <kyle@kyleam.com>
Mon, 27 Mar 2017 01:52:15 +0000 (21:52 -0400)
committerKyle Meyer <kyle@kyleam.com>
Mon, 27 Mar 2017 01:52:15 +0000 (21:52 -0400)
1  2 
doc/org.texi

diff --cc doc/org.texi
Simple merge