Return-Path: X-Original-To: apmail-river-commits-archive@www.apache.org Delivered-To: apmail-river-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 10E3E9B77 for ; Sat, 18 Feb 2012 23:46:03 +0000 (UTC) Received: (qmail 28390 invoked by uid 500); 18 Feb 2012 23:46:03 -0000 Delivered-To: apmail-river-commits-archive@river.apache.org Received: (qmail 28353 invoked by uid 500); 18 Feb 2012 23:46:02 -0000 Mailing-List: contact commits-help@river.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@river.apache.org Delivered-To: mailing list commits@river.apache.org Received: (qmail 28340 invoked by uid 99); 18 Feb 2012 23:46:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 18 Feb 2012 23:46:02 +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; Sat, 18 Feb 2012 23:46:01 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D3D0923888D2; Sat, 18 Feb 2012 23:45:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1290906 - /river/jtsk/merge/ Date: Sat, 18 Feb 2012 23:45:41 -0000 To: commits@river.apache.org From: peter_firmstone@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120218234541.D3D0923888D2@eris.apache.org> Author: peter_firmstone Date: Sat Feb 18 23:45:41 2012 New Revision: 1290906 URL: http://svn.apache.org/viewvc?rev=1290906&view=rev Log: Prepare for merge 2nd try Added: river/jtsk/merge/ - copied from r1241254, river/jtsk/trunk/