Merge branch '2.5'

Conflicts:
	pom.xml
	release-notes/VERSION

Author: cowtowncoder

pom.xml

@@ -35,7 +35,6 @@ JSON Schema (http://tools.ietf.org/html/draft-zyp-json-schema-03) version 3 gene
   <properties>
     <version.jackson.annotations>2.5.0</version.jackson.annotations>
     <version.jackson.core>2.6.0-SNAPSHOT</version.jackson.core>
-
     <osgi.export>${project.groupId}.jsonSchema.*</osgi.export>
   </properties>
 

release-notes/VERSION

@@ -10,9 +10,9 @@ Project: jackson-module-jsonSchema
 - Added `JsonSchemaGenerator(ObjectWriter)` to allow use of (re-)configured `ObjectWriter`
   instead of `ObjectMapper` which can not be configured.
 
-2.5.1 (not yet released)
+2.5.1 (06-Feb-2015)
 
-...
+No changes since 2.5.0
 
 2.5.0 (01-Jan-2015)