Merge branch 'maint' master
authorKyle Meyer <kyle@kyleam.com>
Sun, 7 Feb 2016 16:56:36 +0000 (11:56 -0500)
committerKyle Meyer <kyle@kyleam.com>
Sun, 7 Feb 2016 16:56:36 +0000 (11:56 -0500)
1  2 
doc/org.texi
lisp/org-capture.el

diff --cc doc/org.texi
Simple merge
Simple merge