[easymock] 01/02: Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-java/easymock

[Markus Koschany]

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

apo-guest pushed a commit to branch master
in repository easymock.

commit bc9ad401663b7923ab6e36ff1c076040d20c0cec
Merge: f6591d4 2843250
Author: Markus Koschany <apo at gambaru.de>
Date:   Tue Nov 25 18:52:55 2014 +0100

    Merge branch 'upstream' of git+ssh://git.debian.org/git/pkg-java/easymock


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