]> code.delx.au - gnu-emacs-elpa/commitdiff
delx.au / code / gnu-emacs-elpa / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b19cbe 6b3f092)
Pretend to merge branch 'master' into emacs24
authorDmitry Gutov <dgutov@yandex.ru>
Wed, 12 Dec 2012 21:17:07 +0000 (01:17 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Wed, 12 Dec 2012 21:17:07 +0000 (01:17 +0400)
Conflicts:
README.md
js2-mode.el


Trivial merge