From 8e080eac0ac0b95d1ad011b89827ce8394ca6192 Mon Sep 17 00:00:00 2001
From: Stephan Hradek <github.mails.skeeve@xoxy.net>
Date: Sun, 29 Dec 2013 23:51:22 +0100
Subject: [PATCH] fixed issue #314

---
 core/modules/parsers/wikiparser/rules/table.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/modules/parsers/wikiparser/rules/table.js b/core/modules/parsers/wikiparser/rules/table.js
index 16f75736c..57e1f9cad 100644
--- a/core/modules/parsers/wikiparser/rules/table.js
+++ b/core/modules/parsers/wikiparser/rules/table.js
@@ -51,6 +51,16 @@ var processRow = function(prevColumns) {
 			colSpanCount++;
 			// Move to just before the `|` terminating the cell
 			this.parser.pos = cellRegExp.lastIndex - 1;
+		} else if(cellMatch[1] === "<" && prevCell) {
+			try {
+				colSpanCount = 1+prevCell.attributes.colspan.value;
+			} catch (e) {
+				colSpanCount = 2;
+			}
+			$tw.utils.addAttributeToParseTreeNode(prevCell,"colspan",colSpanCount);
+			colSpanCount = 1;
+			// Move to just before the `|` terminating the cell
+			this.parser.pos = cellRegExp.lastIndex - 1;
 		} else if(cellMatch[2]) {
 			// End of row
 			if(prevCell && colSpanCount > 1) {