Merge branch 'master' into with-dvcs

diff --cc redakcja/static/js/wiki/xslt.js
index 4f562a2,9efeba3..ff36666
--- 1/redakcja/static/js/wiki/xslt.js
--- 2/redakcja/static/js/wiki/xslt.js
+++ b/redakcja/static/js/wiki/xslt.js
@@@ -253,13 -253,8 +253,13 @@@ HTMLSerializer.prototype.serialize = fu
                                break;
                        case TEXT_NODE:
                                self.result += text_buffer;
-                               text_buffer = token.node.nodeValue;
+                               text_buffer = token.node.nodeValue.replace('&', '&amp;').replace('<', '&lt;');
                                break;
 +            case COMMENT_NODE:
 +                self.result += text_buffer;
 +                text_buffer = '';
 +                self.result += '<!--' + token.node.nodeValue + '-->';
 +                break;
                };
        };
      self.result += text_buffer;