[testng] 02/04: Merge branch 'upstream'

[Eugene Zhukov]

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

eugene-guest pushed a commit to branch master
in repository testng.

commit 2c81241966b8f066af7742b208c1439f8d7982a6
Merge: 136fe8c 2d3a5eb
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Tue Aug 18 09:52:12 2015 +0000

    Merge branch 'upstream'


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