Cleanup after merge

i2p2www/pages/meetings/show.html

 {% extends "global/layout.html" %}
-{% block title %}Meeting {{ id }}{% endblock %}
+{% block title %}I2P Development Meeting {{ id }}{% endblock %}
 {% block content %}
-{{ header }}
+{% autoescape false %}
+{% if header %}
+{{ header | restructuredtext }}
+{% endif %}
+{% endautoescape %}
+<div class="irclog">
 <pre>
-{{ log }}
+{{ log|escape }}
+{# TODO: pygments #}
 </pre>
+</div>
 {% endblock %}

show.html.other

-{% extends "global/layout.html" %}
-{% block title %}I2P Development Meeting {{ id }}{% endblock %}
-{% block content %}
-{% autoescape false %}
-{% if header %}
-{{ header | restructuredtext }}
-{% endif %}
-{% endautoescape %}
-<div class="irclog">
-<pre>
-{{ log|escape }}
-{# TODO: pygments #}
-</pre>
-</div>
-{% endblock %}