diff --git a/VERSION b/VERSION
index 4e3ab045..bc210e9a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-Version 2.7.4-stable+timestamp.2013.11.07.10.47.19
+Version 2.7.4-stable+timestamp.2013.11.07.11.00.04
diff --git a/gluon/contrib/markmin/markmin2html.py b/gluon/contrib/markmin/markmin2html.py
index fc7e3396..2d3b2aa9 100755
--- a/gluon/contrib/markmin/markmin2html.py
+++ b/gluon/contrib/markmin/markmin2html.py
@@ -927,7 +927,7 @@ def render(text,
         text = text.encode('utf8')
     text = str(text or '')
     text = regex_backslash.sub(lambda m: m.group(1).translate(ttab_in), text)
-    text = text.replace('\x05','') # concatenate strings separeted by \\n
+    text = text.replace('\x05','').replace('\r\n', '\n') # concatenate strings separeted by \\n
 
     if URL is not None:
         text = replace_at_urls(text,URL)