Merge branch 'maint'
commit24dacbd8338dc4c8971c82fdf873057122226a73
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 6 Feb 2016 23:04:27 +0000 (7 00:04 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Sat, 6 Feb 2016 23:04:27 +0000 (7 00:04 +0100)
tree14f3adfc56e4b9bc8b48ad1e73d9ccf66b4ad436
parent18dff8d3fa9d42089077c3f1bef52996bc1a593c
parent825ce04b9e4dd26365c5535e041b43d7dfdac2a5
Merge branch 'maint'
lisp/ob-core.el