From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: master c6f03ed: Fix a problem in url.el without GnuTLS Date: Fri, 12 Dec 2014 16:28:35 +0200 Message-ID: <83a92trlgs.fsf@gnu.org> References: <20141211155740.11916.1584@vcs.savannah.gnu.org> <87ppbquo97.fsf@gmail.com> <83zjaurreb.fsf@gnu.org> <874mt14wrc.fsf@lifelogs.com> <83egs5rzlr.fsf@gnu.org> <877fxx2e6t.fsf@lifelogs.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1418394554 14181 80.91.229.3 (12 Dec 2014 14:29:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 12 Dec 2014 14:29:14 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 12 15:29:05 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XzRDN-000248-I3 for ged-emacs-devel@m.gmane.org; Fri, 12 Dec 2014 15:29:05 +0100 Original-Received: from localhost ([::1]:57559 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzRDN-0008Vc-4f for ged-emacs-devel@m.gmane.org; Fri, 12 Dec 2014 09:29:05 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:35654) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzRD0-0008N8-5x for emacs-devel@gnu.org; Fri, 12 Dec 2014 09:28:48 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XzRCt-0004Lq-1u for emacs-devel@gnu.org; Fri, 12 Dec 2014 09:28:42 -0500 Original-Received: from mtaout21.012.net.il ([80.179.55.169]:63982) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XzRCs-0004LO-QP for emacs-devel@gnu.org; Fri, 12 Dec 2014 09:28:34 -0500 Original-Received: from conversion-daemon.a-mtaout21.012.net.il by a-mtaout21.012.net.il (HyperSendmail v2007.08) id <0NGH00G003IBYR00@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Fri, 12 Dec 2014 16:28:33 +0200 (IST) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by a-mtaout21.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NGH00G6Z47KZF10@a-mtaout21.012.net.il> for emacs-devel@gnu.org; Fri, 12 Dec 2014 16:28:33 +0200 (IST) In-reply-to: <877fxx2e6t.fsf@lifelogs.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: Solaris 10 X-Received-From: 80.179.55.169 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:179907 Archived-At: > From: Ted Zlatanov > Date: Fri, 12 Dec 2014 08:24:58 -0500 > > I can attempt another merge of the emacs-24 branch... with fear :) No need to fear, just remember to review what "git show" displays, after the merge and before you push. If it doesn't look OK to you, you can always reset to cancel the merge.