tree 616d0fe0216fa4dd6bfb925edd9318f6d8200fb0
parent ce1dc19b3ccfb734af551c2d694a3a3d1039f7fa
parent 550ac15a18b6eedbbef6f9d27992baa7857acd0d
author ddekany <ddekany@apache.org> 1452724653 +0100
committer ddekany <ddekany@apache.org> 1452724653 +0100

Merge remote-tracking branch 'origin/2.3.24-gae-stabilization' into 2.3

Conflicts:
	build.xml