[testng] 338/355: Merge branch 'master' into gradle

[Eugene Zhukov]

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

eugene-guest pushed a commit to annotated tag OpenBSD
in repository testng.

commit a7f623c44a8183e54ff9273faceb6882a097c2ba
Merge: 7d9f5b7 11584cf
Author: Cedric Beust <cedric at beust.com>
Date:   Sun May 17 11:42:28 2015 -0700

    Merge branch 'master' into gradle

 CHANGES.txt                          | 6 ++++++
 src/main/java/org/testng/TestNG.java | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

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