Merge tag 'release_2013-11-25' into archweb-generic

Django 1.6 upgrade and other changes

Conflicts:
	templates/news/list.html
	templates/public/index.html

4 files changed, 4 insertions, 0 deletions

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 8970fad0..6dc7defd 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load cycle from future %}
 {% load static from staticfiles %}
 {% load flags %}
 {% load tz %}
diff --git a/templates/devel/index.html b/templates/devel/index.html
index 62cdc1ed..02940ab1 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load cycle from future %}
 {% load static from staticfiles %}
 {% load cache %}
 {% load package_extras %}
diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index 51e98579..a67553bb 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load cycle from future %}
 {% load static from staticfiles %}
 {% load attributes %}
 {% load package_extras %}
diff --git a/templates/devel/stats.html b/templates/devel/stats.html
index 2dbe4755..9b3b1d28 100644
--- a/templates/devel/stats.html
+++ b/templates/devel/stats.html
@@ -1,3 +1,4 @@
+{% load cycle from future %}
 {% load cache %}
 
 {% cache 60 dev-dash-by-arch %}