Merge remote-tracking branch 'upstream/master'

Keep the latex and tag-specific feeds in bootstrap3

Conflicts:
	pelican-bootstrap3/templates/base.html

1 files changed, 1 insertions, 1 deletions

diff --git a/nmnlist/templates/index.html b/nmnlist/templates/index.html
index b754a8e..274eb5d 100644
--- a/nmnlist/templates/index.html
+++ b/nmnlist/templates/index.html
@@ -22,7 +22,7 @@
             {% endif %}
         {# other items #}
         {% else %} 
-            <li><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title}}">{{ article.title }}</a></li>
+            <li><a href="{{ SITEURL }}/{{ article.url }}" rel="bookmark" title="Permalink to {{ article.title|striptags }}">{{ article.title }}</a></li>
         {% endif %}
 {% endfor %}
     {% if loop.length > 1 %}