From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 6 Nov 2013 17:53:12 +0000 (+0200)
Subject: Merge remote-tracking branch 'js2-mode/master'
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/561e896deb28ae4b2d5cff09e89853181b48a0e1

Merge remote-tracking branch 'js2-mode/master'
---

561e896deb28ae4b2d5cff09e89853181b48a0e1
diff --cc packages/js2-mode/.dir-locals.el
index 000000000,db359736b..db359736b
mode 000000,100644..100644
--- a/packages/js2-mode/.dir-locals.el
+++ b/packages/js2-mode/.dir-locals.el