Return-Path: X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org Delivered-To: apmail-marmotta-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 DDB6BFBC7 for ; Wed, 10 Apr 2013 12:06:24 +0000 (UTC) Received: (qmail 8509 invoked by uid 500); 10 Apr 2013 12:06:24 -0000 Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org Received: (qmail 8180 invoked by uid 500); 10 Apr 2013 12:06:22 -0000 Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@marmotta.apache.org Delivered-To: mailing list commits@marmotta.apache.org Received: (qmail 8131 invoked by uid 99); 10 Apr 2013 12:06:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 12:06:21 +0000 X-ASF-Spam-Status: No, hits=-2002.4 required=5.0 tests=ALL_TRUSTED,RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Wed, 10 Apr 2013 12:06:19 +0000 Received: (qmail 7048 invoked by uid 99); 10 Apr 2013 12:05:57 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 10 Apr 2013 12:05:57 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 4F3EF81866A; Wed, 10 Apr 2013 12:05:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sschaffert@apache.org To: commits@marmotta.incubator.apache.org Date: Wed, 10 Apr 2013 12:05:58 -0000 Message-Id: <0ff5a87aac1d48288bfefcaae5a6ce8d@git.apache.org> In-Reply-To: <79ea19f0ba224960a82a4a8b8ff5eb48@git.apache.org> References: <79ea19f0ba224960a82a4a8b8ff5eb48@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta X-Virus-Checked: Checked by ClamAV on apache.org Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-marmotta Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/0009aef9 Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/0009aef9 Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/0009aef9 Branch: refs/heads/master Commit: 0009aef9cb7eaed2379cf4b0a4796abd047a15ad Parents: 6ae50a0 855e591 Author: Sebastian Schaffert Authored: Wed Apr 10 14:05:24 2013 +0200 Committer: Sebastian Schaffert Committed: Wed Apr 10 14:05:24 2013 +0200 ---------------------------------------------------------------------- launchers/marmotta-installer/pom.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ----------------------------------------------------------------------