Merge remote-tracking branch 'origin/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/77b451ba Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/77b451ba Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/77b451ba Branch: refs/heads/wicket-6.x Commit: 77b451ba8df3138fbad21de8808fe5562e49eeaa Parents: da5c6d7 68f8390 Author: Martijn Dashorst <[email protected]> Authored: Sun Nov 8 14:25:30 2015 +0100 Committer: Martijn Dashorst <[email protected]> Committed: Sun Nov 8 14:25:30 2015 +0100 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Localizer.java | 4 +- .../form/upload/MultiFileUploadFieldTest.java | 2 +- .../wicket/guice/GuiceFieldValueFactory.java | 2 +- .../guice/GuiceFieldValueFactoryTest.java | 58 ++++++++++++++++++++ 4 files changed, 62 insertions(+), 4 deletions(-) ----------------------------------------------------------------------
