From: Dmitry Gutov <dgutov@yandex.ru>
Date: Fri, 24 Apr 2015 02:56:24 +0000 (+0300)
Subject: Merge commit 'ac93b9eef9b6ac44d187b9688d68a7a5f205b3fe' from js2-mode
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/54df2598550c8040def7aec80d04847458d990df

Merge commit 'ac93b9eef9b6ac44d187b9688d68a7a5f205b3fe' from js2-mode

Conflicts:
	packages/js2-mode/js2-mode.el
---

54df2598550c8040def7aec80d04847458d990df