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 AC65B10B3E for ; Fri, 5 Apr 2013 08:20:29 +0000 (UTC) Received: (qmail 53714 invoked by uid 500); 5 Apr 2013 08:20:29 -0000 Delivered-To: apmail-syncope-commits-archive@syncope.apache.org Received: (qmail 53680 invoked by uid 500); 5 Apr 2013 08:20:28 -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 53669 invoked by uid 99); 5 Apr 2013 08:20:28 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Apr 2013 08:20:28 +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; Fri, 05 Apr 2013 08:20:27 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 3C28C2388906; Fri, 5 Apr 2013 08:20:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1464884 - in /syncope/trunk: ./ NOTICE legal_ext/NOTICE Date: Fri, 05 Apr 2013 08:20:07 -0000 To: commits@syncope.apache.org From: ilgrosso@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130405082007.3C28C2388906@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: ilgrosso Date: Fri Apr 5 08:20:06 2013 New Revision: 1464884 URL: http://svn.apache.org/r1464884 Log: Merge from 1_1_X Modified: syncope/trunk/ (props changed) syncope/trunk/NOTICE syncope/trunk/legal_ext/NOTICE Propchange: syncope/trunk/ ------------------------------------------------------------------------------ Merged /syncope/branches/1_0_X:r1464439-1464882 Merged /syncope/branches/1_1_X:r1464873-1464883 Modified: syncope/trunk/NOTICE URL: http://svn.apache.org/viewvc/syncope/trunk/NOTICE?rev=1464884&r1=1464883&r2=1464884&view=diff ============================================================================== --- syncope/trunk/NOTICE (original) +++ syncope/trunk/NOTICE Fri Apr 5 08:20:06 2013 @@ -1,5 +1,5 @@ Apache Syncope -Copyright 2012 The Apache Software Foundation +Copyright 2012-2013 The Apache Software Foundation This product includes software developed by: The Apache Software Foundation (http://www.apache.org/). Modified: syncope/trunk/legal_ext/NOTICE URL: http://svn.apache.org/viewvc/syncope/trunk/legal_ext/NOTICE?rev=1464884&r1=1464883&r2=1464884&view=diff ============================================================================== --- syncope/trunk/legal_ext/NOTICE (original) +++ syncope/trunk/legal_ext/NOTICE Fri Apr 5 08:20:06 2013 @@ -1,5 +1,5 @@ Apache Syncope -Copyright 2012 The Apache Software Foundation +Copyright 2012-2013 The Apache Software Foundation This product includes software developed by: The Apache Software Foundation (http://www.apache.org/).