Merge from trunk.

[gnu-emacs] / lisp / emacs-lisp / ert-x.el

diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index bb14b84117a6e431040afd16ced92b7b1b941c07..39d4a4e814a3f056e2eeb0456941ee9f7691fc26 100644 (file)
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -1,6 +1,6 @@
 ;;; ert-x.el --- Staging area for experimental extensions to ERT
 
-;; Copyright (C) 2008, 2010, 2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2010-2011 Free Software Foundation, Inc.
 
 ;; Author: Lennart Borgman (lennart O borgman A gmail O com)
 ;; Author: Christian Ohler <ohler@gnu.org>