]> git.eshelyaron.com Git - emacs.git/commit
Merge from origin/emacs-24
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 4 Apr 2015 21:58:35 +0000 (14:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 4 Apr 2015 21:58:35 +0000 (14:58 -0700)
commitc1b8b17a7ac22123fe8d2d647265f19d2cc92625
treeb7629da2b1b5bcb6755cb3343bef8f84c036f05e
parent48395495d6f6602f666c11d0b38f6600b629ccfc
parentdd3f56789371c904c53f057b288cdcfc9cc56b25
Merge from origin/emacs-24

dd3f567 Fix tramp-tests.el

Conflicts:
test/ChangeLog
test/ChangeLog