Return-Path: X-Original-To: apmail-aries-commits-archive@www.apache.org Delivered-To: apmail-aries-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 7986373B2 for ; Wed, 28 Sep 2011 17:56:53 +0000 (UTC) Received: (qmail 11680 invoked by uid 500); 28 Sep 2011 17:56:53 -0000 Delivered-To: apmail-aries-commits-archive@aries.apache.org Received: (qmail 11610 invoked by uid 500); 28 Sep 2011 17:56:53 -0000 Mailing-List: contact commits-help@aries.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@aries.apache.org Delivered-To: mailing list commits@aries.apache.org Received: (qmail 11598 invoked by uid 99); 28 Sep 2011 17:56:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Sep 2011 17:56:53 +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; Wed, 28 Sep 2011 17:56:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id BF9B423888CC for ; Wed, 28 Sep 2011 17:56:29 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r796320 - in /websites/production/aries: ./ content/.htaccess Date: Wed, 28 Sep 2011 17:56:29 -0000 To: commits@aries.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20110928175629.BF9B423888CC@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Wed Sep 28 17:56:29 2011 New Revision: 796320 Log: Publishing merge to aries site by dkulp Added: websites/production/aries/content/.htaccess - copied unchanged from r796319, websites/staging/aries/trunk/content/.htaccess Modified: websites/production/aries/ (props changed) Propchange: websites/production/aries/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Sep 28 17:56:29 2011 @@ -1 +1 @@ -/websites/staging/aries/trunk:782169-796314 +/websites/staging/aries/trunk:782169-796319