Merge from origin/emacs-24

[gnu-emacs] / lisp / net / trampver.el

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 70092d21207362f269ede01297d4d4a8e6418cfb..226ec9f194a75a5b2522bc8f23ee3e056252a89c 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -31,7 +31,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.11-24.5"
+(defconst tramp-version "2.2.12-pre"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
@@ -44,7 +44,7 @@
                      (= emacs-major-version 21)
                      (>= emacs-minor-version 4)))
             "ok"
-          (format "Tramp 2.2.11-24.5 is not fit for %s"
+          (format "Tramp 2.2.12-pre is not fit for %s"
                   (when (string-match "^.*$" (emacs-version))
                     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))