]> code.delx.au - gnu-emacs-elpa/commit
Merge branch 'master' into emacs24
authorDmitry Gutov <dgutov@yandex.ru>
Sun, 3 Jun 2012 17:37:23 +0000 (21:37 +0400)
committerDmitry Gutov <dgutov@yandex.ru>
Sun, 3 Jun 2012 22:46:22 +0000 (02:46 +0400)
commit20995f67febf797469872fd95bb8f8f2ff03fd78
tree09a7151ddf5de4596d691521e8ebd7fc9fcacee0
parent32a113aa8971e93a382a7dfb1b069232238c18cf
parent262bf9d41456ebd90f4e59c82feb24ef9a5f98cd
Merge branch 'master' into emacs24

Conflicts:
js2-mode.el
js2-imenu-extras.el
js2-mode.el