Merged in [9141] from rjsparks@nostrum.com:

Fix ordering issue on agenda.html.
 - Legacy-Id: 9150
Note: SVN reference [9141] has been migrated to Git commit 29ac6363a1

ietf/group/migrations/0003_auto_20150304_0743.py

@@ -1,7 +1,7 @@
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import models, migrations # pyflakes:ignore
 
 
 class Migration(migrations.Migration):

ietf/group/resources.py

@@ -84,7 +84,7 @@ class GroupHistoryResource(ModelResource):
     parent = ToOneField(GroupResource, 'parent', null=True)
     ad = ToOneField(PersonResource, 'ad', null=True)
     group = ToOneField(GroupResource, 'group')
-    unused_states = ToManyField('ietf.doc.StateResource', 'unused_states', null=True)
+    unused_states = ToManyField('ietf.doc.resources.StateResource', 'unused_states', null=True)
     unused_tags = ToManyField(DocTagNameResource, 'unused_tags', null=True)
     class Meta:
         queryset = GroupHistory.objects.all()

ietf/meeting/models.py

@@ -664,7 +664,7 @@ class ScheduledSession(models.Model):
     pinned   = models.BooleanField(default=False, help_text="Do not move session during automatic placement")
 
     class Meta:
-        ordering = ["timeslot__time", "session__group__parent__name", "session__group__acronym", "session__name", ]
+        ordering = ["timeslot__time", "timeslot__type__slug", "session__group__parent__name", "session__group__acronym", "session__name", ]
 
     # use to distinguish this from FakeScheduledSession in placement.py
     faked   = "real"

ietf/person/migrations/0003_auto_20150304_0829.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import models, migrations # pyflakes:ignore
 
 
 def set_primary_email(apps, schema_editor):