# HG changeset patch
# User Production Moz <dev@sopinspace.com>
# Date 1333708557 -7200
# Node ID 87adb908e6497480040fcc2ff8a7423c745ce877
# Parent  3d03b25cd90d544702f1cc0983a891e53b9902d9# Parent  88b733a63c081f48eb00cbb898cb190ab27b5f28
Merge some previous commits.

diff -r 88b733a63c08 -r 87adb908e649 src/cm/views/texts.py
--- a/src/cm/views/texts.py	Thu Mar 22 10:36:35 2012 +0100
+++ b/src/cm/views/texts.py	Fri Apr 06 12:35:57 2012 +0200
@@ -564,7 +564,7 @@
     """
     gen = unified_diff(text1.replace('\r\n','\n').split('\n'), text2.replace('\r\n','\n').split('\n'), n=3)
     index = 0
-    res = ['<table class="diff"><col class="diff-marker"/><col class="diff-content"/><col class="diff-separator"/<col class="diff-marker"/><col class="diff-content"/><tbody>']
+    res = ['<table class="diff"><col class="diff-marker"/><col class="diff-content"/><col class="diff-separator"/><col class="diff-marker"/><col class="diff-content"/><tbody>']
     res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2))
     res.append('<tr><td></td><td class="diff-author">%s</td><td></td><td></td><td class="diff-author">%s</td></tr>' %(author1, author2))
     res.append('<tr><td colspan="5"></td></tr>')