Merge branch 'master' of git://projects.archlinux.org/archweb

Conflicts:
	local_settings.py.example
	media/archweb.css
	packages/templatetags/package_extras.py
	public/views.py
	templates/packages/details.html
	templates/packages/flag.html
	templates/packages/flag_confirmed.html
	templates/packages/flagged.html
	templates/packages/packages_list.html
	templates/packages/search.html
	templates/packages/signoffs.html
	templates/public/about.html
	templates/public/download.html
	templates/public/index.html
	templates/public/svn.html
	templates/releng/results.html
	templates/todolists/view.html

1 files changed, 3 insertions, 4 deletions

diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html
index 97a14ff2..d2328381 100644
--- a/templates/packages/flagged.html
+++ b/templates/packages/flagged.html
@@ -1,16 +1,15 @@
 {% extends "base.html" %}
+{% load package_extras %}
+
 {% block title %}Parabola - Flag Package - {{ pkg.pkgname }}{% endblock %}
 {% block navbarclass %}anb-packages{% endblock %}
 
 {% block content %}
 <div id="pkg-flagged-error" class="box">
-
     <h2>Error: Package already flagged</h2>
 
     <p><strong>{{pkg.pkgname}}</strong> has already been flagged out-of-date.</p>
 
-    <p>You can return to the package details page for
-    <a href="{{ pkg.get_absolute_url }}" title="Package details for {{pkg.pkgname}}">{{pkg.pkgname}}</a>.</p>
-
+    <p>You can return to the package details page for {% pkg_details_link pkg %}.</p>
 </div>
 {% endblock %}