auto upstream

1 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e8363efde2d..d56d74b20db 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-02  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Merge from gnulib, incorporating copyright-date changes and:
+        2012-12-31 dup2: work around cygwin bug
+
 2012-12-30  Jan Djärv  <jan.h.d@swipnet.se>
 
         * configure.ac: Check for GtkHandlebox.
@@ -11867,7 +11872,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1993-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1993-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.