Return-Path: X-Original-To: apmail-freemarker-notifications-archive@minotaur.apache.org Delivered-To: apmail-freemarker-notifications-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 04F1818EAF for ; Wed, 13 Jan 2016 23:48:56 +0000 (UTC) Received: (qmail 12828 invoked by uid 500); 13 Jan 2016 23:48:55 -0000 Delivered-To: apmail-freemarker-notifications-archive@freemarker.apache.org Received: (qmail 12808 invoked by uid 500); 13 Jan 2016 23:48:55 -0000 Mailing-List: contact notifications-help@freemarker.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@freemarker.incubator.apache.org Delivered-To: mailing list notifications@freemarker.incubator.apache.org Received: (qmail 12798 invoked by uid 99); 13 Jan 2016 23:48:55 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Jan 2016 23:48:55 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 7C2BD1A0805 for ; Wed, 13 Jan 2016 23:48:55 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.226 X-Spam-Level: * X-Spam-Status: No, score=1.226 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-0.554] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id og9ZJNXvXX5t for ; Wed, 13 Jan 2016 23:48:55 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 74BD043F16 for ; Wed, 13 Jan 2016 23:48:54 +0000 (UTC) Received: (qmail 12794 invoked by uid 99); 13 Jan 2016 23:48:53 -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; Wed, 13 Jan 2016 23:48:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CBB8EE0007; Wed, 13 Jan 2016 23:48:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ddekany@apache.org To: notifications@freemarker.incubator.apache.org Date: Wed, 13 Jan 2016 23:48:54 -0000 Message-Id: <819e2b9ec6854ceab14286ae28e90f3a@git.apache.org> In-Reply-To: <110eb258c5694b498d2ef120c42f9aa1@git.apache.org> References: <110eb258c5694b498d2ef120c42f9aa1@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] incubator-freemarker git commit: Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3 Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3 Project: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/commit/b9ca91dd Tree: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/tree/b9ca91dd Diff: http://git-wip-us.apache.org/repos/asf/incubator-freemarker/diff/b9ca91dd Branch: refs/heads/2.3 Commit: b9ca91dd5c3b04121f5ddcb9f6194c1e7931ba2c Parents: 46dc678 0c71d8f Author: ddekany Authored: Thu Jan 14 00:48:45 2016 +0100 Committer: ddekany Committed: Thu Jan 14 00:48:45 2016 +0100 ---------------------------------------------------------------------- build.xml | 5 ++++- src/dist/jar/META-INF/NOTICE | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/b9ca91dd/build.xml ----------------------------------------------------------------------