Return-Path: X-Original-To: apmail-subversion-commits-archive@minotaur.apache.org Delivered-To: apmail-subversion-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 33788983C for ; Tue, 7 Feb 2012 09:25:41 +0000 (UTC) Received: (qmail 50632 invoked by uid 500); 7 Feb 2012 09:25:40 -0000 Delivered-To: apmail-subversion-commits-archive@subversion.apache.org Received: (qmail 50573 invoked by uid 500); 7 Feb 2012 09:25:38 -0000 Mailing-List: contact commits-help@subversion.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@subversion.apache.org Delivered-To: mailing list commits@subversion.apache.org Received: (qmail 50543 invoked by uid 99); 7 Feb 2012 09:25:35 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Feb 2012 09:25:35 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.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; Tue, 07 Feb 2012 09:25:33 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 11C6523888CD for ; Tue, 7 Feb 2012 09:25:13 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn propchange: r1241385 - svn:log Date: Tue, 07 Feb 2012 09:25:13 -0000 To: commits@subversion.apache.org From: philip@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120207092513.11C6523888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: philip Revision: 1241385 Modified property: svn:log Modified: svn:log at Tue Feb 7 09:25:13 2012 ------------------------------------------------------------------------------ --- svn:log (original) +++ svn:log Tue Feb 7 09:25:13 2012 @@ -1 +1,3 @@ Merge r1230212 to 1.6.x-r1230212 and resolve conflicts. + +[Reverted by r1241386.]