Merge branch 'archweb' into archweb-generic2

Conflicts:
	devel/views.py
	feeds.py
	public/views.py
	settings.py
	sitestatic/archweb.js
	templates/base.html
	templates/devel/profile.html
	templates/mirrors/status.html
	templates/news/view.html
	templates/packages/flaghelp.html
	templates/packages/opensearch.xml
	templates/public/download.html
	templates/public/feeds.html
	templates/public/index.html
	templates/registration/login.html
	templates/releng/results.html
	templates/todolists/public_list.html

1 files changed, 2 insertions, 2 deletions

diff --git a/main/migrations/0024_set_initial_flag_date.py b/main/migrations/0024_set_initial_flag_date.py
index 5026f721..bd008792 100644
--- a/main/migrations/0024_set_initial_flag_date.py
+++ b/main/migrations/0024_set_initial_flag_date.py
@@ -1,14 +1,14 @@
 # encoding: utf-8
-import datetime
 from south.db import db
 from south.v2 import DataMigration
 from django.db import models
+from django.utils.timezone import now
 
 class Migration(DataMigration):
 
     def forwards(self, orm):
         orm.Package.objects.filter(needupdate=False).update(flag_date=None)
-        orm.Package.objects.filter(needupdate=True).update(flag_date=datetime.datetime.now())
+        orm.Package.objects.filter(needupdate=True).update(flag_date=now())
 
     def backwards(self, orm):
         orm.Package.objects.filter(flag_date__isnull=True).update(needupdate=False)