Merge branch 'master' into 5539-named-parameters-type
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3b661b5c Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3b661b5c Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3b661b5c Branch: refs/heads/master Commit: 3b661b5cbd6f83191446973daca72fe02e413834 Parents: cb4590a d6897c9 Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Tue Aug 12 10:46:41 2014 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Tue Aug 12 10:46:41 2014 +0200 ---------------------------------------------------------------------- .../resources/META-INF/maven/archetype-metadata.xml | 11 ++++++++--- .../src/main/resources/__log4j.properties__ | 12 ++++++++++++ .../src/main/resources/log4j.properties | 12 ------------ .../org/apache/wicket/core/util/string/CssUtils.java | 3 ++- .../org/apache/wicket/protocol/http/WebApplication.java | 10 +++++----- 5 files changed, 27 insertions(+), 21 deletions(-) ----------------------------------------------------------------------
