[jackson-datatype-guava] 02/02: Merge branch 'upstream'

[Tim Potter]

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

tpot-guest pushed a commit to branch master
in repository jackson-datatype-guava.

commit 17e76b0a3c354a92e9dcbf80628625e8fafc7e40
Merge: c8294cb cbe7961
Author: Tim Potter <tpot at hp.com>
Date:   Mon Nov 17 12:42:15 2014 +1100

    Merge branch 'upstream'

 DEV/contributor-agreement.pdf | Bin 45328 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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