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