Merge branch '2.5'

Conflicts:
	pom.xml
	release-notes/VERSION

Author: cowtowncoder

release-notes/VERSION

@@ -16,7 +16,7 @@ Project: jackson-databind
 #727: Improve `ObjectWriter.forType()` to avoid forcing base type for container types
 - Remove old cglib compatibility tests; cause problems in Eclipse
 
-2.5.2 (not yet released)
+2.5.2 (29-Mar-2015)
 
 #609: Problem resolving locally declared generic type
  (repoted by Hal H)