Merge branch '2.6'

cowtowncoder · cowtowncoder · commit 520a8f49615b · 2016-04-04T20:52:21.000-07:00
Conflicts:
	release-notes/VERSION
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,3 @@
+# Do not merge `pom.xml` from older version, as it will typically conflict
+
+pom.xml merge=ours
diff --git a/release-notes/VERSION b/release-notes/VERSION
@@ -28,7 +28,7 @@ No changes since 2.7.1
 
 #54: LocalDateTimeSerializer default constructor should use the same formatter as LocalDateTimeDeserializer
 
-2.6.6 (not released yet)
+2.6.6 (05-Apr-2016)
 
 #16: Instant is serialized as String by some dataformats/libs but can't be
   deserialized (unless manually converted to float)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	+# Do not merge `pom.xml` from older version, as it will typically conflict
	`2`	`+`
	`3`	`+pom.xml merge=ours`