[jenkins-commons-jelly] 03/04: Merge tag 'upstream/1.1-jenkins-20120928'

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository jenkins-commons-jelly.

commit 97cf18001da314892ad83ba6ab7ed517f8553657
Merge: cab20e3 5e41234
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 5 12:54:22 2014 +0200

    Merge tag 'upstream/1.1-jenkins-20120928'
    
    Upstream version 1.1-jenkins-20120928

 jelly-core/pom.xml                                 |  6 ++--
 .../apache/commons/jelly/impl/StaticTagScript.java |  3 ++
 .../org/apache/commons/jelly/impl/TagScript.java   | 40 ++++++++++++++--------
 .../apache/commons/jelly/tags/core/IncludeTag.java |  2 +-
 4 files changed, 33 insertions(+), 18 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jenkins-commons-jelly.git