Merge from emacs--rel--22

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

diff --git a/lisp/net/ldap.el b/lisp/net/ldap.el
index 7f936ed0bdb6b480c85e6c35e029dd9a7cf696ce..42535f6363f444754aa896a48deeb9433cb32d04 100644 (file)
--- a/lisp/net/ldap.el
+++ b/lisp/net/ldap.el
@@ -1,7 +1,7 @@
 ;;; ldap.el --- client interface to LDAP for Emacs
 
 ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-;;   2005, 2006 Free Software Foundation, Inc.
+;;   2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Oscar Figueiredo <oscar@cpe.fr>
 ;; Maintainer: FSF
@@ -12,7 +12,7 @@
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
+;; the Free Software Foundation; either version 3, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -619,5 +619,5 @@ an alist of attribute/value pairs."
 
 (provide 'ldap)
 
-;;; arch-tag: 47913a76-6155-42e6-ac58-6d28b5d50eb0
+;; arch-tag: 47913a76-6155-42e6-ac58-6d28b5d50eb0
 ;;; ldap.el ends here