Merge commit 'osqa/master'

Conflicts:
	forum/skins/default/media/js/wmd/wmd.js
	forum/skins/default/templates/base.html
	forum/skins/default/templates/base_content.html
	forum/views.py
	locale/en/LC_MESSAGES/django.mo
	locale/en/LC_MESSAGES/django.po
	settings_local.py.dist

1 files changed, 0 insertions, 49 deletions

diff --git a/templates/404.html b/templates/404.html
deleted file mode 100644
index 227de3ae..00000000
--- a/templates/404.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{% extends "base_content.html" %}
-<!-- template 404.html -->
-{% load i18n %}
-{% block title %}{% spaceless %}404 Error{% endspaceless %}{% endblock %}
-{% block forestyle%}
-    <style type="text/css">
- 		form input { margin-right: 5px; }
-	</style>
-{% endblock %}
-{% block forejs %}
-       <script type="text/javascript">
-        $().ready(function(){
-            $("#linkPrevious").bind("click", back=function(){history.go(-1);})            
-        });
-         
-        </script>
-{% endblock %}
-{% block content %}
-<div id="main-bar" class="headNormal">
-    404 Not Found
-</div>
-<div id="main-body" class="">
-    <div style="padding:5px 0px 10px 0;line-height:25px;">
-        <h3>{% trans "Sorry, could not find the page you requested." %}</h3>
-        <div style="margin-top:5px">
-        {% trans "This might have happened for the following reasons:" %}<br/>
-        <ul>
-            <li>{% trans "this question or answer has been deleted;" %}</li>
-            <li>{% trans "url has error - please check it;" %}</li>
-            <li>{% trans "the page you tried to visit is protected or you don't have sufficient points, see" %} <a href="{% url faq %}"> faq</a>;</li>
-            <li>{% trans "if you believe this error 404 should not have occured, please" %} 
-				<a href="{{feedback_site_url}}" target="_blank">{% trans "report this problem" %}</a></li>
-            </u>
-        </div>
-        <script type="text/javascript">
-            var GOOG_FIXURL_LANG = '{{settings.LANGUAGE_CODE}}';
-            var GOOG_FIXURL_SITE = '{{site_url}}';
-        </script>
-        <script type="text/javascript" src="http://linkhelp.clients.google.com/tbproxy/lh/wm/fixurl.js"></script>
-        <ul>
-            <li><a href="#" id="linkPrevious">{% trans "back to previous page" %} »</li>
-            <li><a href="{% url questions %}">{% trans "see all questions" %} »</a></li>
-            <li><a href="{% url tags %}">{% trans "see all tags" %} »</a></li>
-        </u>
-    </div>
-
-</div>
-{% endblock %}
-<!-- end template 404.html -->