[testng] 344/355: Merge pull request #684 from guillaumecle/master

[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 7940da3563eb5f0d8833620e0d776b463207706a
Merge: 9b35243 2fc56c5
Author: Cedric Beust <cedric at beust.com>
Date:   Wed May 20 18:11:53 2015 -0700

    Merge pull request #684 from guillaumecle/master
    
    add doc for guice stage

 CHANGES.txt                       | 1 +
 doc/documentation-main.html       | 7 +++++--
 src/main/resources/testng-1.0.dtd | 5 ++++-
 3 files changed, 10 insertions(+), 3 deletions(-)


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