Merge branch '2.4'

2013-04-12 15:35:38 +04:00
parent b0933dd473 abe2ea59ed
commit 3b364330ad
75 changed files with 1259 additions and 3979 deletions
--- a/modules/ts/misc/testlog_parser.py
+++ b/modules/ts/misc/testlog_parser.py
@@ -1,4 +1,4 @@
-#/usr/bin/env python
+#!/usr/bin/env python

 import sys, re, os.path
 from xml.dom.minidom import parse