Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/maven-surefire
into s2
Conflicts:
pom.xml
Project: http://git-wip-us.apache.org/repos/asf/maven-surefire/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-surefire/commit/9c8a7590
Tree: http://git-wip-us.apache.org/repos/asf/maven-surefire/tree/9c8a7590
Diff: http://git-wip-us.apache.org/repos/asf/maven-surefire/diff/9c8a7590
Branch: refs/heads/master
Commit: 9c8a75906a6146456f4b0d3d757ce09898408adc
Parents: cb97ba7 257f59e
Author: Tibor17 <[email protected]>
Authored: Tue Sep 22 07:55:40 2015 +0200
Committer: Tibor17 <[email protected]>
Committed: Tue Sep 22 07:55:40 2015 +0200
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
