From: Dmitry Gutov <dgutov@yandex.ru>
Date: Sat, 18 Jul 2015 01:14:32 +0000 (+0300)
Subject: Merge commit '494c421bfa6f1b72b577267cb3841b0eff262250' from js2-mode
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/a7b8100b52925d82aa1d6fd8606a537ea88b91b9

Merge commit '494c421bfa6f1b72b577267cb3841b0eff262250' from js2-mode
---

a7b8100b52925d82aa1d6fd8606a537ea88b91b9
diff --cc packages/js2-mode/js2-old-indent.el
index 000000000,9b1c9296f..9b1c9296f
mode 000000,100644..100644
--- a/packages/js2-mode/js2-old-indent.el
+++ b/packages/js2-mode/js2-old-indent.el