Merge branch 'master' into newmc

Conflicts:
	tmpl/skel.en

diff --git a/tmpl/skel.en b/tmpl/skel.en
index 0fc3aa4fa3c99edd1ab00f1cbed936ff26913974..8c6460c86e2297c98f7d0ee1ed79bd01c1737e55 100644 (file)
--- a/tmpl/skel.en
+++ b/tmpl/skel.en
@@ -40,7 +40,7 @@
 <div id="webchat"><a href="http://webchat.oftc.net/?channels=%23mindcoding" target="_blank">Webchat</a></div>
 
 <div id="tracker" class="hidden">
-<h1>Track user</h1>
+<h3>Track user</h3>
 <div id="tracker_form">
 <div class="form-group">
 <label for="tracker_username">Username</label>