[jackson-annotations] 93/207: Merge branch 'master' of https://github.com/FasterXML/jackson-annotations

[Timo Aaltonen]

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

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

commit 42b669e90c1dbe71a2cb9ea73a544841b8a23739
Merge: 6cf2284 05a421d
Author: Tatu Saloranta <tsaloranta at salesforce.com>
Date:   Mon Nov 5 11:51:03 2012 -0700

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

 release-notes/VERSION                                             | 2 +-
 src/main/java/com/fasterxml/jackson/annotation/JsonUnwrapped.java | 2 +-
 src/main/java/com/fasterxml/jackson/annotation/JsonView.java      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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