Merge branch '2.5' into 2.6

Conflicts:
	pom.xml

Author: cowtowncoder

pom.xml

@@ -34,6 +34,9 @@ Guava (http://code.google.com/p/guava-libraries/) types (currently mostly just c
     <version.guava>15.0</version.guava>
     <version.guava.osgi>${version.guava}.0</version.guava.osgi>
 
+    <!-- 11-Sep-2015, tatu: As per [datatype-guava#80] -->
+    <version.guava.osgi>[${version.guava}.0,20)</version.guava.osgi>
+
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>com/fasterxml/jackson/datatype/guava</packageVersion.dir>
     <packageVersion.package>${project.groupId}.guava</packageVersion.package>

release-notes/VERSION

@@ -23,6 +23,11 @@ No changes since 2.6.0
 #74: Multimap serializer ignores _valueTypeSerializer
  (reported by soldierkam@github)
 
+2.5.5 (not yet released)
+
+#80: Relax OSGi version constraints for Guava dependency.
+ (requested by Benson M)
+
 2.5.4 (09-Jun-2015)
 
 - Add override for `MultimapSerializer.isEmpty(SerializerProvider, Multimap<?,?>)`
@@ -47,10 +52,6 @@ No changes since 2.5.0
 #56: Add support `HashCode`
  (contributed by Stephan S, Stephan202@github)
 
-2.4.7 (not released)
-
-#48: Avoid problems deserializing `null` for `Optional`
-
 2.4.6 (23-Apr-2015)
 
 #61: NPE serializing `Multimap`s with null values