Merge commit '91c451'

Conflicts:
	devel/views.py
	feeds.py
	local_settings.py.example
	packages/management/commands/signoff_report.py
	packages/views/flag.py
	public/views.py
	templates/404.html
	templates/base.html
	templates/devel/clock.html
	templates/devel/index.html
	templates/devel/packages.html
	templates/devel/profile.html
	templates/general_form.html
	templates/mirrors/mirror_details.html
	templates/mirrors/mirrorlist.txt
	templates/mirrors/mirrorlist_generate.html
	templates/mirrors/mirrorlist_status.txt
	templates/mirrors/mirrors.html
	templates/mirrors/status.html
	templates/news/add.html
	templates/news/delete.html
	templates/news/list.html
	templates/news/view.html
	templates/packages/details.html
	templates/packages/differences.html
	templates/packages/files.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/flaghelp.html
	templates/packages/groups.html
	templates/packages/opensearch.xml
	templates/packages/packages_list.html
	templates/packages/search.html
	templates/packages/signoff_options.html
	templates/packages/signoffs.html
	templates/packages/stale_relations.html
	templates/public/about.html
	templates/public/art.html
	templates/public/blank.html
	templates/public/donate.html
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/public/keys.html
	templates/public/svn.html
	templates/public/userlist.html
	templates/registration/login.html
	templates/registration/logout.html
	templates/releng/add.html
	templates/releng/results.html
	templates/releng/thanks.html
	templates/todolists/list.html
	templates/todolists/public_list.html
	templates/todolists/todolist_confirm_delete.html
	templates/todolists/view.html
	templates/visualize/index.html
	todolists/views.py

4 files changed, 5 insertions, 5 deletions

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 0cad9d1b..9ee5494a 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -2,11 +2,11 @@
 {% load static from staticfiles %}
 {% load tz %}
 
-{% block title %}Parabola GNU/Linux-libre - Hackers World Clocks{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Hacker World Clocks{% endblock %}
 
 {% block content %}
 <div id="dev-clocks-box" class="box">
-    <h2>Hackers World Clocks</h2>
+    <h2>Hacker World Clocks</h2>
 
     <p>This page helps prevent you from waking a sleeping hacker. It also
     depends on hackers keeping the time zone information up to date, so if
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 9f897317..de132fd0 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -3,7 +3,7 @@
 {% load cache %}
 {% load package_extras %}
 
-{% block title %}Parabola - Hacker Dashboard{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Hacker Dashboard{% endblock %}
 
 {% block content %}
 <div id="dev-dashboard" class="box">
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index 6979e8c2..77146891 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -3,7 +3,7 @@
 {% load attributes %}
 {% load package_extras %}
 
-{% block title %}Parabola - {{ title }}{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - {{ title }}{% endblock %}
 
 {% block content %}
 <div class="box">
diff --git a/templates/devel/profile.html b/templates/devel/profile.html
index b497a20a..54a3771c 100644
--- a/templates/devel/profile.html
+++ b/templates/devel/profile.html
@@ -1,5 +1,5 @@
 {% extends "base.html" %}
-{% block title %}Parabola - Edit Profile{% endblock %}
+{% block title %}{{ BRANDING_DISTRONAME }} - Edit Profile{% endblock %}
 
 {% block content %}
 <div id="dev-edit-profile" class="box">