]> git.eshelyaron.com Git - emacs.git/commit
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)
commitf9fabb2bb099d944cc97a87933b86b9eae02d067
tree13c6f240754d553ae0f0e76cd0535209a6256c14
parent570edf257366990dcbd2a057174495bb0bcebdf5
parentb0f3a4959389b6f0e8fdb4cf84c0792aa1b95985
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
lisp/net/tramp.el