Merge remote-tracking branch 'origin/master'

# Conflicts:
#	static/style.css

7 files changed, 1 insertions, 8 deletions

diff --git a/pysite/views/wiki/edit.py b/pysite/views/wiki/edit.py
index 9cff9da0..2cd4181c 100644
--- a/pysite/views/wiki/edit.py
+++ b/pysite/views/wiki/edit.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import datetime
 import difflib
 
diff --git a/pysite/views/wiki/history/compare.py b/pysite/views/wiki/history/compare.py
index d42a6b36..6296f734 100644
--- a/pysite/views/wiki/history/compare.py
+++ b/pysite/views/wiki/history/compare.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import difflib
 
 from pygments import highlight
diff --git a/pysite/views/wiki/history/show.py b/pysite/views/wiki/history/show.py
index e18b017e..00a1dc27 100644
--- a/pysite/views/wiki/history/show.py
+++ b/pysite/views/wiki/history/show.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import datetime
 
 from werkzeug.exceptions import NotFound
@@ -9,7 +8,7 @@ from pysite.mixins import DBMixin
 
 
 class RevisionsListView(RouteView, DBMixin):
-    path = "/history/show/<string:page>"
+    path = "/history/show/<path:page>"
     name = "history.show"
 
     table_name = "wiki_revisions"
diff --git a/pysite/views/wiki/index.py b/pysite/views/wiki/index.py
index 778a808c..8290eac9 100644
--- a/pysite/views/wiki/index.py
+++ b/pysite/views/wiki/index.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from flask import url_for
 from werkzeug.utils import redirect
 
diff --git a/pysite/views/wiki/page.py b/pysite/views/wiki/page.py
index 500d5c04..26edfcc4 100644
--- a/pysite/views/wiki/page.py
+++ b/pysite/views/wiki/page.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from flask import redirect, url_for
 from werkzeug.exceptions import NotFound
 
diff --git a/pysite/views/wiki/render.py b/pysite/views/wiki/render.py
index 9d3e8cc3..b08f54dd 100644
--- a/pysite/views/wiki/render.py
+++ b/pysite/views/wiki/render.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 import re
 
 from docutils.utils import SystemMessage
diff --git a/pysite/views/wiki/source.py b/pysite/views/wiki/source.py
index 80f362df..83674447 100644
--- a/pysite/views/wiki/source.py
+++ b/pysite/views/wiki/source.py
@@ -1,4 +1,3 @@
-# coding=utf-8
 from flask import redirect, url_for
 from pygments import highlight
 from pygments.formatters.html import HtmlFormatter