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