From mboxrd@z Thu Jan  1 00:00:00 1970
From: Bastien <bzg@altern.org>
Subject: bug#12718: /srv/bzr/emacs/trunk r110652: Fix error in previous merge
 from Org.
Date: Fri, 26 Oct 2012 16:45:35 +0200
Message-ID: <87k3uds35c.fsf__40691.5992185988$1351262783$gmane$org@bzg.ath.cx>
References: <E1TR2hp-0001C0-J5@vcs.savannah.gnu.org>
	<87zk3byjii.fsf@bzg.ath.cx>
	<yyx4nlj91lk.fsf__47004.0841763423$1351102722$gmane$org@fencepost.gnu.org>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([208.118.235.92]:53825)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1TRlAd-0003cx-Gj
	for emacs-orgmode@gnu.org; Fri, 26 Oct 2012 10:46:01 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1TRlAX-00084D-Kv
	for emacs-orgmode@gnu.org; Fri, 26 Oct 2012 10:45:59 -0400
Sender: debbugs-submit-bounces@debbugs.gnu.org
Resent-To: bug-gnu-emacs@gnu.org, emacs-orgmode@gnu.org
Resent-Message-ID: <handler.12718.D12718.13512628477529.done@debbugs.gnu.org>
In-Reply-To: <yyx4nlj91lk.fsf__47004.0841763423$1351102722$gmane$org@fencepost.gnu.org>
	(Chong Yidong's message of "Wed, 24 Oct 2012 14:17:11 -0400")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Chong Yidong <cyd@gnu.org>
Cc: 12718-done@debbugs.gnu.org, Jambunathan K <kjambunathan@gmail.com>

Chong Yidong <cyd@gnu.org> writes:

> OK, reverted.  Please go ahead and commit your other fix.

Thanks.  

I've merged the bugfix branch of Org in current Emacs trunk.

I'm closing this bug.

-- 
 Bastien