Merge branch '2.5'

Conflicts:
	release-notes/CREDITS
	release-notes/VERSION
	src/main/java/com/fasterxml/jackson/databind/deser/std/EnumDeserializer.java

Author: cowtowncoder

release-notes/CREDITS

@@ -221,6 +221,11 @@ Dylan Scott (dylanscott@github)
     issue)
    (2.5.2)
 
+John Meyer (jpmeyer@github)
+  * Reported, contributed fix for #745: EnumDeserializer.deserializerForCreator fails
+    when used to deserialize a Map key
+   (2.5.3)
+
 Charles Allen (drcrallen@github):
   * Reported #696: Copy constructor does not preserve `_injectableValues`
    (2.6.0)

release-notes/VERSION

@@ -16,6 +16,11 @@ 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.3 (not yet released)
+
+#745: EnumDeserializer.deserializerForCreator fails when used to deserialize a Map key
+ (contributed by John M)
+
 2.5.2 (29-Mar-2015)
 
 #609: Problem resolving locally declared generic type