Merge http://github.com/nullin/testng into Nalin3
Conflicts:
CHANGES.txt
diff --git a/CHANGES.txt b/CHANGES.txt
index e535279..fbd04a6 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -7,10 +7,10 @@
Added: Passing command line properties via the ant task and doc update (Todd Wells)
Added: Hierarchical XmlSuites (Nalin Makar)
Added: Reporter#clear()
-Fixed: If inherited configuration methods had defined deps, they could be invoked in incorrect order
+Fixed: If inherited configuration methods had defined deps, they could be invoked in incorrect order (Nalin Makar)
Fixed: Initialize all Suite/Test runners at beginning to catch configuration issues right at start (Nalin Makar)
-Fixed: Issue7, Issue86 Incorrect dates reported for configuration methods
-Fixed: Issue24 OOM errors in SuiteHTMLReporter (Nalin Makar)
+Fixed: Issue7: Issue86 Incorrect dates reported for configuration methods
+Fixed: Issue24: OOM errors in SuiteHTMLReporter (Nalin Makar)
Fixed: Time outs specified in XML were not honored for <suite parallel="tests">
Fixed: <suite> and <test> time outs were hardcoded, they now honor their time-out attribute
Fixed: TestNG was hanging if no test methods were found
