summaryrefslogtreecommitdiff
path: root/lisp/net
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2013-01-02 18:37:57 -0800
committerGlenn Morris <rgm@gnu.org>2013-01-02 18:37:57 -0800
commit0a8bf3afca415fec94742cf830622b22f186062c (patch)
tree7ca943a0622ea184e1a9dc97d31509d063e138b5 /lisp/net
parent2036b4b8e075479ea5333689e299183b9c2f3ebb (diff)
parent75e78d1e904bde7eae13b78202f99081543701dc (diff)
downloademacs-0a8bf3afca415fec94742cf830622b22f186062c.tar.gz
emacs-0a8bf3afca415fec94742cf830622b22f186062c.tar.bz2
emacs-0a8bf3afca415fec94742cf830622b22f186062c.zip
Merge from emacs-24; up to 2012-12-06T07:33:20Z!rgm@gnu.org
Diffstat (limited to 'lisp/net')
-rw-r--r--lisp/net/tramp-sh.el4
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 58ad7a6661f..5bbf1708654 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -805,7 +805,7 @@ on the remote host.")
(defconst tramp-perl-encode
"%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
use strict;
my %%trans = do {
@@ -843,7 +843,7 @@ This string is passed to `format', so percent characters need to be doubled.")
(defconst tramp-perl-decode
"%s -e '
# This script contributed by Juanma Barranquero <lektu@terra.es>.
-# Copyright (C) 2002-2012 Free Software Foundation, Inc.
+# Copyright (C) 2002-2013 Free Software Foundation, Inc.
use strict;
my %%trans = do {