Re: master c6f03ed: Fix a problem in url.el without GnuTLS

[Ted Zlatanov]

On Fri, 12 Dec 2014 19:25:38 -0500 Ted Zlatanov <address@hidden> wrote: 

TZ> On Fri, 12 Dec 2014 16:28:35 +0200 Eli Zaretskii <address@hidden> wrote: 
EZ> No need to fear, just remember to review what "git show" displays,
EZ> after the merge and before you push.  If it doesn't look OK to you,
EZ> you can always reset to cancel the merge.

TZ> Yup.  I did it, carefully.

Damn it:

commit 805074d059b5bdb868a4f795a0aca58f49302f66
Author: Paul Eggert <address@hidden>
Date:   Fri Dec 12 16:48:06 2014 -0800

    Remove duplicate ChangeLog entries

Thanks, Paul.  I missed that.

Ted