Merge from trunk

[gnu-emacs] / test / automated / ert-x-tests.el

diff --git a/test/automated/ert-x-tests.el b/test/automated/ert-x-tests.el
index f6f6f74b6815cbb75d4a97375fb8e54ac6f529a3..bb05608e41899bcafd7b7cbcc037f7456bdb6beb 100644 (file)
--- a/test/automated/ert-x-tests.el
+++ b/test/automated/ert-x-tests.el
@@ -1,9 +1,9 @@
 ;;; ert-x-tests.el --- Tests for ert-x.el
 
-;; Copyright (C) 2008, 2010-2011 Free Software Foundation, Inc.
+;; Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc.
 
 ;; Author: Phil Hagelberg
-;; Author: Christian Ohler <ohler@gnu.org>
+;;        Christian Ohler <ohler@gnu.org>
 
 ;; This file is part of GNU Emacs.