Merge branch 'master' into 663-id-to-choice-lookup

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

Branch: refs/heads/sandbox/WICKET-4686
Commit: 950671f2d214697801a10ba59e313f3380a711f3
Parents: dfd3090 f3c873c
Author: Martin Tzvetanov Grigorov <[email protected]>
Authored: Fri Dec 20 12:03:52 2013 +0200
Committer: Martin Tzvetanov Grigorov <[email protected]>
Committed: Fri Dec 20 12:03:52 2013 +0200

----------------------------------------------------------------------
 wicket-core/src/main/java/org/apache/wicket/Page.java       | 9 ++++-----
 .../wicket/request/handler/render/WebPageRendererTest.java  | 5 +++++
 ...WicketTesterLazyIsPageStatelessRedirectToBufferTest.java | 2 --
 ...WicketTesterLazyIsPageStatelessRedirectToRenderTest.java | 2 --
 .../src/main/java/org/apache/wicket/atmosphere/PageKey.java | 3 ++-
 5 files changed, 11 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


Reply via email to