Merge branch 'maint'
commit1aaa0817b68db9c63edeb2b8f78097b9c642d406
authorKyle Meyer <kyle@kyleam.com>
Wed, 18 Nov 2015 02:33:53 +0000 (17 21:33 -0500)
committerKyle Meyer <kyle@kyleam.com>
Wed, 18 Nov 2015 02:33:53 +0000 (17 21:33 -0500)
tree3c169fac709def3365ea783b3fd612e7dbe6490e
parentb5cb6a38735843a76f74c04db5e4e5bb1f57b82f
parent31459201ae191534b640bf466466aefafc342850
Merge branch 'maint'
lisp/ob-core.el
lisp/org.el