Merge branch 'master' into non-fatal-ionon-fatal-io

1 files changed, 5 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index cf23b77d..033c032f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-07         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* regcomp.c, regex.c, regex.h, regex_internal.c, regex_internal.h,
+	regexec.c: Sync with GLIBC. Mostly copyright date updates.
+
 2015-02-06         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* io.c (socketopen): If host lookup fails, check non_fatal_io and