]> code.delx.au - gnu-emacs-elpa/commit
Merge branch 'master' into emacs24
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 12 Dec 2012 21:27:53 +0000 (01:27 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 12 Dec 2012 21:27:53 +0000 (01:27 +0400)
commitbbaa2843a38bd689950e9263c4f4ba5747eb53ed
tree41cf58f53745000a96e0e1c2daa92edf2d90ebc1
parent40dbc6935b8012a62e6f6af8048d5849a64edc6f
parenta310dfc91eec38ce2bf3553ef5bde2fe532b4505
Merge branch 'master' into emacs24

Conflicts:
js2-mode.el
js2-mode.el