Merge branch 'pr-107-wicket-6.x' into wicket-6.x

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/630fbc14
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/630fbc14
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/630fbc14

Branch: refs/heads/wicket-6.x
Commit: 630fbc14ebef57d1b04afadfe7079124590fbe6c
Parents: 64d5bd0 08fe67e
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Thu Mar 12 10:16:24 2015 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Thu Mar 12 10:16:24 2015 +0200

----------------------------------------------------------------------
 .../org/apache/wicket/markup/html/PackageResourceGuard.java   | 3 ++-
 .../apache/wicket/markup/html/PackageResourceGuardTest.java   | 7 ++++++-
 .../org/apache/wicket/markup/html/PackageResourceTest.java    | 2 ++
 3 files changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


Reply via email to