[jackson-jaxrs-providers] 133/162: Merge branch 'master' of https://github.com/FasterXML/jackson-jaxrs-providers

[Timo Aaltonen]

This is an automated email from the git hooks/post-receive script.

tjaalton pushed a commit to branch master
in repository jackson-jaxrs-providers.

commit a2b1980ec41e896efaa366138f10535dd64472ce
Merge: b880246 a3a1e99
Author: Tatu <tsaloranta at gmail.com>
Date:   Thu Mar 6 10:35:16 2014 -0800

    Merge branch 'master' of https://github.com/FasterXML/jackson-jaxrs-providers

 base/pom.xml                                           |  2 +-
 cbor/pom.xml                                           |  2 +-
 json/pom.xml                                           |  2 +-
 .../jackson/jaxrs/json/JacksonJsonProvider.java        | 18 ++++++++++++++++++
 pom.xml                                                |  6 +++---
 release-notes/VERSION                                  | 16 +++++++++++-----
 smile/pom.xml                                          |  2 +-
 .../jackson/jaxrs/smile/JacksonSmileProvider.java      | 18 ++++++++++++++++++
 xml/pom.xml                                            |  2 +-
 .../jackson/jaxrs/xml/JacksonXMLProvider.java          | 18 ++++++++++++++++++
 10 files changed, 73 insertions(+), 13 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/jackson-jaxrs-providers.git