Merge branch 'django14'

Conflicts:
	templates/releng/result_section.html

2 files changed, 5 insertions, 4 deletions

diff --git a/news/models.py b/news/models.py
index 33d958e0..95026e1d 100644
--- a/news/models.py
+++ b/news/models.py
@@ -1,9 +1,10 @@
-from datetime import datetime
-
 from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 
+from main.utils import utc_now
+
+
 class News(models.Model):
     slug = models.SlugField(max_length=255, unique=True)
     author = models.ForeignKey(User, related_name='news_author',
@@ -28,7 +29,7 @@ class News(models.Model):
 
 def set_news_fields(sender, **kwargs):
     news = kwargs['instance']
-    now = datetime.utcnow()
+    now = utc_now()
     news.last_modified = now
     if not news.postdate:
         news.postdate = now
diff --git a/news/urls.py b/news/urls.py
index d938ef58..10020f31 100644
--- a/news/urls.py
+++ b/news/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import patterns
+from django.conf.urls import patterns
 
 urlpatterns = patterns('news.views',
     (r'^$',                         'news_list', {}, 'news-list'),