Merge branch '2.5'

Conflicts:
	pom.xml
	release-notes/VERSION

Author: cowtowncoder

pom.xml

@@ -25,8 +25,8 @@ abstractions.
   </scm>
 
   <properties>
-    <jackson.version.annotations>2.6.0-rc2</jackson.version.annotations>
-    <jackson.version.core>2.6.0-rc2</jackson.version.core>
+    <jackson.version.annotations>2.6.0-rc3</jackson.version.annotations>
+    <jackson.version.core>2.6.0-rc3</jackson.version.core>
     <!-- Generate PackageVersion.java into this directory. -->
     <packageVersion.dir>com/fasterxml/jackson/dataformat/csv</packageVersion.dir>
     <packageVersion.package>${project.groupId}.csv</packageVersion.package>

release-notes/VERSION

@@ -9,7 +9,7 @@ Project: jackson-dataformat-csv
 - Removed type `CsvObjectReader`, sub-classing not needed at this point,
   just complicates handling (for now)
 
-2.5.4 (not yet released)
+2.5.4 (09-Jun-2015)
 
 - Fixes to potential ArrayIndexOutOfBoundsException on `CsvEncoder`, bounds check