summaryrefslogtreecommitdiff
path: root/etc/ERC-NEWS
diff options
context:
space:
mode:
authorjave <joakim@verona.se>2015-01-02 16:30:55 +0100
committerjave <joakim@verona.se>2015-01-02 16:30:55 +0100
commitdb4613576d3115aa320f0293d081ce98baa06acd (patch)
tree829968643b451bd3f64c791e4d3a6c928010e14c /etc/ERC-NEWS
parentc089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff)
parentd0ca1148fe2d1e72e86f0197731071f139c143e3 (diff)
downloademacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz
merge master
Diffstat (limited to 'etc/ERC-NEWS')
-rw-r--r--etc/ERC-NEWS2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/ERC-NEWS b/etc/ERC-NEWS
index dbd48119d00..68aca96d3d7 100644
--- a/etc/ERC-NEWS
+++ b/etc/ERC-NEWS
@@ -1,6 +1,6 @@
ERC NEWS -*- outline -*-
-Copyright (C) 2006-2014 Free Software Foundation, Inc.
+Copyright (C) 2006-2015 Free Software Foundation, Inc.
See the end of the file for license conditions.
* For changes after ERC 5.3, see the main Emacs NEWS file