Imported Upstream version 2.7.1

This commit is contained in:
Laurent Bigonville 2013-11-24 16:00:12 +01:00
parent a1fa151fc7
commit 0121794af9
451 changed files with 41339 additions and 10887 deletions

View file

@ -200,7 +200,7 @@ def buildHTMLTable(deviceData):
except:
cH = False
if cH and cH.get("text") == cellContent:
if not column["name"] == "driver" and cH and cH.get("text") == cellContent:
cH["rowspan"] = cH.get("rowspan", 1) + 1
else:
cell = { "text": cellContent, "rowspan": 1 }