Merge branch 'django14'

Conflicts:
	templates/releng/result_section.html

1 files changed, 2 insertions, 2 deletions

diff --git a/templates/devel/clock.html b/templates/devel/clock.html
index 72a57d0f..3b00075f 100644
--- a/templates/devel/clock.html
+++ b/templates/devel/clock.html
@@ -1,4 +1,5 @@
 {% extends "base.html" %}
+{% load tz %}
 
 {% block title %}Arch Linux - Developer World Clocks{% endblock %}
 
@@ -10,7 +11,6 @@
     depends on developers keeping the time zone information up to date, so if
     you see 'UTC' listed, pester them to update their settings.</p>
     <p>
-    Arch Server Time: {{ now|date:"Y-m-d H:i T" }}<br/>
     UTC Time: {{ utc_now|date:"Y-m-d H:i T" }}
     </p>
 
@@ -33,7 +33,7 @@
                 <td>{{ dev.userprofile.alias }}</td>
                 <td>{{ dev.userprofile.location }}</td>
                 <td>{{ dev.userprofile.time_zone }}</td>
-                <td>{{ dev.current_time|date:"Y-m-d H:i T" }}</td>
+                <td>{{ utc_now|timezone:dev.userprofile.time_zone|date:"Y-m-d H:i T" }}</td>
             </tr>
             {% endfor %}
         </tbody>