| commit | f9fabb2bb099d944cc97a87933b86b9eae02d067 | |
| author | Michael Albinus <michael.albinus@gmx.de> | |
| Wed, 27 May 2015 16:49:29 +0000 (27 18:49 +0200) | ||
| committer | Michael Albinus <michael.albinus@gmx.de> | |
| Wed, 27 May 2015 16:49:29 +0000 (27 18:49 +0200) | ||
| tree | 13c6f240754d553ae0f0e76cd0535209a6256c14 | treesnapshot (tar.gz zip) |
| parent | 570edf257366990dcbd2a057174495bb0bcebdf5 | commitdiff |
| parent | b0f3a4959389b6f0e8fdb4cf84c0792aa1b95985 | commitdiff |
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs
Conflicts:
lisp/net/tramp.el
Conflicts:
lisp/net/tramp.el