[testng] 113/160: Merge branch 'fix-testng-453' of https://github.com/VladRassokhin/testng into VladRassokhin-fix-testng-453

[Eugene Zhukov]

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

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

commit 93b96a595a178af6fe9294bad6413fd15eac397a
Merge: 162b948 b1c39ae
Author: Cedric Beust <cedric at beust.com>
Date:   Fri Jun 12 18:05:36 2015 -0700

    Merge branch 'fix-testng-453' of https://github.com/VladRassokhin/testng into VladRassokhin-fix-testng-453
    
    Conflicts:
    	src/main/java/org/testng/internal/Utils.java

 src/main/java/org/testng/internal/Utils.java | 30 +++++++++++++++-------------
 1 file changed, 16 insertions(+), 14 deletions(-)


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