commit a49ab9a91945a6596d01b0de3a7276bffa01e751
author Tatu Saloranta <tatu.saloranta@iki.fi> Sat Dec 19 16:37:16 2015 -0800
committer Tatu Saloranta <tatu.saloranta@iki.fi> Sat Dec 19 16:37:16 2015 -0800
tree b09fe19e987b53a8e938050334b1f6ae28cb4f22
parent 11c200b115f7b8cc947f702b66001f312a7c66f3
parent 3aee590e9f546ad5cc59c9a75367e410bcea84ea

Merge branch '2.6'

Conflicts:
	src/main/java/com/fasterxml/jackson/databind/deser/std/JsonNodeDeserializer.java

release-notes/VERSION

diff --git a/release-notes/VERSION b/release-notes/VERSION
index a05dbc8..dd5c1b2 100644
--- a/release-notes/VERSION
+++ b/release-notes/VERSION
@@ -65,6 +65,8 @@
 
 2.6.5 (not yet released)
 
+#1052: Don't generate a spurious NullNode after parsing an embedded object
+ (reported by philipa@github)
 #1061: Problem with Object Id and Type Id as Wrapper Object (regression in 2.5.1)
 
 2.6.4 (07-Dec-2015)