Return-Path: Delivered-To: apmail-incubator-couchdb-commits-archive@locus.apache.org Received: (qmail 64788 invoked from network); 30 Aug 2008 23:14:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 30 Aug 2008 23:14:01 -0000 Received: (qmail 96324 invoked by uid 500); 30 Aug 2008 23:13:59 -0000 Delivered-To: apmail-incubator-couchdb-commits-archive@incubator.apache.org Received: (qmail 96301 invoked by uid 500); 30 Aug 2008 23:13:59 -0000 Mailing-List: contact couchdb-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: couchdb-dev@incubator.apache.org Delivered-To: mailing list couchdb-commits@incubator.apache.org Received: (qmail 96292 invoked by uid 99); 30 Aug 2008 23:13:59 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2008 16:13:59 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 30 Aug 2008 23:13:09 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 685312388988; Sat, 30 Aug 2008 16:13:40 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r690605 - /incubator/couchdb/branches/json_term_changes/ Date: Sat, 30 Aug 2008 23:13:40 -0000 To: couchdb-commits@incubator.apache.org From: cmlenz@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080830231340.685312388988@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: cmlenz Date: Sat Aug 30 16:13:40 2008 New Revision: 690605 URL: http://svn.apache.org/viewvc?rev=690605&view=rev Log: Attempt to fixup svnmerge on json_term_changes branch. Modified: incubator/couchdb/branches/json_term_changes/ (props changed) Propchange: incubator/couchdb/branches/json_term_changes/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Sat Aug 30 16:13:40 2008 @@ -1 +1 @@ -/incubator/couchdb/trunk:1-687336 +/incubator/couchdb/trunk:1-688179