Return-Path: X-Original-To: apmail-syncope-commits-archive@www.apache.org Delivered-To: apmail-syncope-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 93B95969E for ; Wed, 12 Nov 2014 13:23:39 +0000 (UTC) Received: (qmail 2430 invoked by uid 500); 12 Nov 2014 13:23:39 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 2357 invoked by uid 500); 12 Nov 2014 13:23:39 -0000 Mailing-List: contact commits-help@syncope.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@syncope.apache.org Delivered-To: mailing list commits@syncope.apache.org Received: (qmail 2242 invoked by uid 99); 12 Nov 2014 13:23:39 -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, 12 Nov 2014 13:23:39 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 3BB19A0FD56; Wed, 12 Nov 2014 13:23:39 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: ilgrosso@apache.org To: commits@syncope.apache.org Date: Wed, 12 Nov 2014 13:23:43 -0000 Message-Id: <5b3cb99faa1a4217b51c8781b0427b0f@git.apache.org> In-Reply-To: <4f40d744d14749e495d0543578fd7edb@git.apache.org> References: <4f40d744d14749e495d0543578fd7edb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/6] syncope git commit: Merge branch '1_1_X' into 1_2_X Merge branch '1_1_X' into 1_2_X Conflicts: pom.xml Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e8d8549d Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e8d8549d Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e8d8549d Branch: refs/heads/1_2_X Commit: e8d8549d0adc991c79d3a941c104482ed70e5ff8 Parents: 49ecca4 3fa1fa2 Author: Francesco Chicchiriccò Authored: Wed Nov 12 14:09:42 2014 +0100 Committer: Francesco Chicchiriccò Committed: Wed Nov 12 14:09:42 2014 +0100 ---------------------------------------------------------------------- ----------------------------------------------------------------------