Merge branch 'maint'
commitb8028c607d69e79e979c043bd0e4da37ca9fb480
authorNicolas Goaziou <n.goaziou@gmail.com>
Thu, 9 Jan 2014 20:37:11 +0000 (9 21:37 +0100)
committerNicolas Goaziou <n.goaziou@gmail.com>
Thu, 9 Jan 2014 20:37:11 +0000 (9 21:37 +0100)
tree91d888e364538a82d3f56f1ef1dcba9cfb2bf716
parent9c1bc61cce306bf50389ca1051e72e5175589613
parent81ce406d8fccebf2449f6d45d0bf59abd747e70d
Merge branch 'maint'
lisp/ob-core.el