Merge branch '2.6'

Conflicts:
	pom.xml
	release-notes/VERSION

Author: cowtowncoder

pom.xml

@@ -29,7 +29,7 @@
   </scm>
 
   <properties>
-    <!-- Java8 takes Javadoc-Nazi attitude, funk that (Oracle go home you're drunk) --> 
+    <!-- Java8 takes Javadoc-Nazi attitude, insert some sanity here --> 
     <additionalparam>-Xdoclint:none</additionalparam>
 
     <version.jackson.core>2.7.0</version.jackson.core>

release-notes/VERSION

@@ -1,4 +1,5 @@
 Project: jackson-datatype-jsr310
+
 ------------------------------------------------------------------------
 === Releases ===
 ------------------------------------------------------------------------
@@ -7,7 +8,7 @@ Project: jackson-datatype-jsr310
 
 #54: LocalDateTimeSerializer default constructor should use the same formatter as LocalDateTimeDeserializer
 
-2.6.4 (not yet released)
+2.6.4 (07-Dec-2015)
 
 #50: `Instant` schema representation is incorrect for timestamps serialization
  (reported by Peter R)