Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id D186E200B94 for ; Sun, 2 Oct 2016 20:40:05 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CEBF3160AEA; Sun, 2 Oct 2016 18:40:05 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0DF6E160AC4 for ; Sun, 2 Oct 2016 20:40:04 +0200 (CEST) Received: (qmail 59803 invoked by uid 500); 2 Oct 2016 18:40:04 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 59785 invoked by uid 99); 2 Oct 2016 18:40:04 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 02 Oct 2016 18:40:04 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 170BAE053F; Sun, 2 Oct 2016 18:40:04 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: snoopdave@apache.org To: commits@roller.apache.org Date: Sun, 02 Oct 2016 18:40:05 -0000 Message-Id: <8ff45af0b50341839e0ca7983395bab3@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] roller-website git commit: Merge branch 'asf-site' archived-at: Sun, 02 Oct 2016 18:40:06 -0000 Merge branch 'asf-site' Conflicts: content/downloads/downloads.html Project: http://git-wip-us.apache.org/repos/asf/roller-website/repo Commit: http://git-wip-us.apache.org/repos/asf/roller-website/commit/0cda4367 Tree: http://git-wip-us.apache.org/repos/asf/roller-website/tree/0cda4367 Diff: http://git-wip-us.apache.org/repos/asf/roller-website/diff/0cda4367 Branch: refs/heads/asf-site Commit: 0cda43677a25f7ec1d531a34f6759c3853fc9701 Parents: 5d3c500 34d0f14 Author: Dave Johnson Authored: Sun Oct 2 14:39:33 2016 -0400 Committer: Dave Johnson Committed: Sun Oct 2 14:39:33 2016 -0400 ---------------------------------------------------------------------- ----------------------------------------------------------------------