tree 04c75a0f79a0c1e53aed1034eb7d14c850c4b718
parent c62096801d5b02fc5e2404871e52aee0249b5f0d
parent def5937389253d814e0d2b85376da0e5f416f031
author ddekany <ddekany@apache.org> 1451743874 +0100
committer ddekany <ddekany@apache.org> 1451743992 +0100

Merge remote-tracking branch 'origin/2.3-gae'

Conflicts:
	src/main/resources/freemarker/version.properties