Merge branch 'maint' master
authorNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Nov 2014 23:04:51 +0000 (00:04 +0100)
committerNicolas Goaziou <mail@nicolasgoaziou.fr>
Fri, 21 Nov 2014 23:04:51 +0000 (00:04 +0100)
1  2 
lisp/ob-js.el

diff --cc lisp/ob-js.el
Simple merge