]> git.eshelyaron.com Git - emacs.git/commitdiff
projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 570edf2 b0f3a49)
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
authorMichael Albinus <michael.albinus@gmx.de>
Wed, 27 May 2015 16:49:29 +0000 (18:49 +0200)
committerMichael Albinus <michael.albinus@gmx.de>
Wed, 27 May 2015 16:49:29 +0000 (18:49 +0200)
Conflicts:
lisp/net/tramp.el


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.