Merge branch 'maint'
commit15d591ee4441a4de37d941734572977aeb5430de
authorKyle Meyer <kyle@kyleam.com>
Tue, 26 Jan 2016 06:17:43 +0000 (26 01:17 -0500)
committerKyle Meyer <kyle@kyleam.com>
Tue, 26 Jan 2016 06:17:43 +0000 (26 01:17 -0500)
tree67a5376ad304305c2c46e984ea60a19095c9c8dc
parentc74b99a75b26f3ee3ee296ba9996afcbd6f915de
parentf02d15d6776bea05bc79793355494fcf1b9eb2fd
Merge branch 'maint'
lisp/ob-core.el
lisp/org.el