Merge from emacs-23; up to 2010-06-16T23:27:20Z!jay.p.belanger@gmail.com.

[bpt/emacs.git] / etc / ERC-NEWS

diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index 127bb71..17bf4fc 100644 (file)
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,6 @@
 ERC NEWS                                                       -*- outline -*-
 
-Copyright (C) 2006, 2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
+Copyright (C) 2006-2011  Free Software Foundation, Inc.
 See the end of the file for license conditions.
 
 * Changes in ERC 5.3
@@ -1343,4 +1343,3 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
 
-arch-tag: 2b21b387-6cdc-4192-889c-6743cfffdcb1