resolve ChangeLog merge conflict

diff --cc ChangeLog
index a380abdc0b70d6792aa87affd80e5e76c78a78a9,7e68314438d1e240f27ab6d0ee4d28dc37068a59..d62ccf19799d80bc1293e1535828ca77b6745be2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,26 -1,11 +1,34 @@@
 +2014-12-23  Stephen Leake  <stephen_leake@stephe-leake.org>
 +
 +      * CONTRIBUTE: add Savannah url, cleanup announcing freeze.
 +
+ 2014-12-23  Paul Eggert  <eggert@cs.ucla.edu>
+ 
+       Merge from gnulib
+       2014-12-20 utimens: remove unnecessary assert
+       2014-12-16 stdalign: port better to HP compilers
+       2014-12-16 stdalign: work around Apple GCC 4.0 bug
+       * lib/stdalign.in.h, lib/utimens.c, m4/stdalign.m4: Update from gnulib.
+ 
 +2014-12-19  Stephen Leake  <stephen_leake@stephe-leake.org>
 +
 +      Move user-level information from CONTRIBUTE to doc/emacs/trouble.texi
 +
 +      Fixes bug#19299
 +
 +      * CONTRIBUTE: Move user-level information to doc/emacs/trouble.texi
 +        (commit messages): new, gathered from comments on emacs-devel
 +        (Changelog notes): add reference to GNU coding standards section 5.2;
 +        doc 'present tense', bug fix format
 +        (branches): freeze announcements are made on info-gnu-emacs mailing
 +        list
 +        (git vs rename): new
 +
 +      * doc/emacs/trouble.texi: Move user-level information from CONTRIBUTE here
 +
 +      * lisp/startup.el (fancy-about-text): change buttons for etc/CONTRIBUTE
 +        to (info "(emacs)Contributing")
 +
  2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
  
        Spelling fixes