From: Dmitry Gutov <dgutov@yandex.ru>
Date: Wed, 12 Dec 2012 21:17:07 +0000 (+0400)
Subject: Pretend to merge branch 'master' into emacs24
X-Git-Url: https://code.delx.au/gnu-emacs-elpa/commitdiff_plain/40dbc6935b8012a62e6f6af8048d5849a64edc6f

Pretend to merge branch 'master' into emacs24

Conflicts:
	README.md
	js2-mode.el
---

40dbc6935b8012a62e6f6af8048d5849a64edc6f