Return-Path: X-Original-To: apmail-incubator-ooo-commits-archive@minotaur.apache.org Delivered-To: apmail-incubator-ooo-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 0C7FD6BBD for ; Mon, 20 Jun 2011 17:02:19 +0000 (UTC) Received: (qmail 40358 invoked by uid 500); 20 Jun 2011 17:02:19 -0000 Delivered-To: apmail-incubator-ooo-commits-archive@incubator.apache.org Received: (qmail 40328 invoked by uid 500); 20 Jun 2011 17:02:18 -0000 Mailing-List: contact ooo-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ooo-dev@incubator.apache.org Delivered-To: mailing list ooo-commits@incubator.apache.org Received: (qmail 40321 invoked by uid 99); 20 Jun 2011 17:02:18 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Jun 2011 17:02:18 +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; Mon, 20 Jun 2011 17:02:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 45FAE23889E0; Mon, 20 Jun 2011 17:01:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r791288 - in /websites/production/openofficeorg: ./ content/openofficeorg/docs/edit-cms.html Date: Mon, 20 Jun 2011 17:01:56 -0000 To: ooo-commits@incubator.apache.org From: marcus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110620170156.45FAE23889E0@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: marcus Date: Mon Jun 20 17:01:55 2011 New Revision: 791288 Log: Publishing merge to openofficeorg site by marcus Added: websites/production/openofficeorg/content/openofficeorg/docs/edit-cms.html - copied unchanged from r791287, websites/staging/openofficeorg/trunk/content/openofficeorg/docs/edit-cms.html Modified: websites/production/openofficeorg/ (props changed) Propchange: websites/production/openofficeorg/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Mon Jun 20 17:01:55 2011 @@ -1 +1 @@ -/websites/staging/openofficeorg/trunk:791146-791276 +/websites/staging/openofficeorg/trunk:791146-791287