[jackson-annotations] 190/207: Merge branch 'master' of 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 2b8b00aaaa3acd78f8d9f45c4bc9d3926186a570
Merge: 6faed9e 642e149
Author: Tatu Saloranta <tatu.saloranta at iki.fi>
Date:   Thu May 29 09:46:21 2014 -0700

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

 src/main/java/com/fasterxml/jackson/annotation/JsonFormat.java | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

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