summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/ert-x.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-04-17 14:38:34 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2012-04-17 14:38:34 -0700
commitae6e112df045de8ddc22e85f8538975d4664b325 (patch)
tree3923d0ff634b043c69f87255b52619d195dfc6ad /lisp/emacs-lisp/ert-x.el
parentad85a071cc6d583041969d300793c92f21a54696 (diff)
parent197b6f3c605872bfeb7b2024d255142d8f579021 (diff)
downloademacs-ae6e112df045de8ddc22e85f8538975d4664b325.tar.gz
emacs-ae6e112df045de8ddc22e85f8538975d4664b325.tar.bz2
emacs-ae6e112df045de8ddc22e85f8538975d4664b325.zip
Merge from trunk.
Diffstat (limited to 'lisp/emacs-lisp/ert-x.el')
-rw-r--r--lisp/emacs-lisp/ert-x.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/ert-x.el b/lisp/emacs-lisp/ert-x.el
index 257d0528cbc..a7916354c91 100644
--- a/lisp/emacs-lisp/ert-x.el
+++ b/lisp/emacs-lisp/ert-x.el
@@ -3,7 +3,7 @@
;; Copyright (C) 2008, 2010-2012 Free Software Foundation, Inc.
;; Author: Lennart Borgman (lennart O borgman A gmail O com)
-;; Author: Christian Ohler <ohler@gnu.org>
+;; Christian Ohler <ohler@gnu.org>
;; This file is part of GNU Emacs.