From mboxrd@z Thu Jan  1 00:00:00 1970
Received: by 10.90.87.14 with SMTP id k14cs1327242agb;
        Thu, 31 Dec 2009 13:31:21 -0800 (PST)
Received: by 10.229.15.203 with SMTP id l11mr8177461qca.43.1262295081421;
        Thu, 31 Dec 2009 13:31:21 -0800 (PST)
Return-Path: <sup-devel-bounces@rubyforge.org>
Received: from rubyforge.org (rubyforge.org [205.234.109.19])
        by mx.google.com with ESMTP id 7si22828767qyk.12.2009.12.31.13.31.21;
        Thu, 31 Dec 2009 13:31:21 -0800 (PST)
Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19;
Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org
Received: from rubyforge.org (rubyforge.org [127.0.0.1])
	by rubyforge.org (Postfix) with ESMTP id 2A53D167830D;
	Thu, 31 Dec 2009 16:31:21 -0500 (EST)
Received: from pion.club.cc.cmu.edu (PION.CLUB.CC.cmu.edu [128.237.157.88])
	by rubyforge.org (Postfix) with ESMTP id C05D218580F5
	for <sup-devel@rubyforge.org>; Thu, 31 Dec 2009 16:31:18 -0500 (EST)
Received: from rlane by pion.club.cc.cmu.edu with local (Exim 4.69)
	(envelope-from <rlane@zyrg.net>)
	id 1NQSc2-0002VO-AS; Thu, 31 Dec 2009 16:31:18 -0500
From: Rich Lane <rlane@club.cc.cmu.edu>
To: William Morgan <wmorgan-sup@masanjin.net>
In-reply-to: <1262291246-sup-2713@masanjin.net>
References: <1262291246-sup-2713@masanjin.net>
Date: Thu, 31 Dec 2009 16:31:18 -0500
Message-Id: <1262294884-sup-3554@zyrg.net>
User-Agent: Sup/git
Cc: sup-devel mailing list <sup-devel@rubyforge.org>
Subject: Re: [sup-devel] topic branch merge report
X-BeenThere: sup-devel@rubyforge.org
X-Mailman-Version: 2.1.12
Precedence: list
Reply-To: Sup developer discussion <sup-devel@rubyforge.org>
List-Id: Sup developer discussion <sup-devel.rubyforge.org>
List-Unsubscribe: <http://rubyforge.org/mailman/options/sup-devel>,
	<mailto:sup-devel-request@rubyforge.org?subject=unsubscribe>
List-Archive: <http://rubyforge.org/pipermail/sup-devel>
List-Post: <mailto:sup-devel@rubyforge.org>
List-Help: <mailto:sup-devel-request@rubyforge.org?subject=help>
List-Subscribe: <http://rubyforge.org/mailman/listinfo/sup-devel>,
	<mailto:sup-devel-request@rubyforge.org?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: sup-devel-bounces@rubyforge.org
Errors-To: sup-devel-bounces@rubyforge.org

Excerpts from William Morgan's message of Thu Dec 31 15:31:50 -0500 2009:
> Rich, I think I need your help with the two branches 'xapian-bugfix' and
> 'xapian-message-state', which are generating a conflict for some reason,
> and I don't understand the code well enough to resolve.  Would you be
> able to publish a branch ahead of master that has these two merged?
> Thanks!

Done. Branch xapian-merged at git://github.com/rlane/sup
_______________________________________________
Sup-devel mailing list
Sup-devel@rubyforge.org
http://rubyforge.org/mailman/listinfo/sup-devel