Merge lp://staging/~cjohnston/summit/2013-copy into lp://staging/summit

summit/__init__.py (+1/-1)
summit/common/admin/__init__.py (+1/-1)
summit/common/context_processors.py (+1/-1)
summit/common/management/commands/linaro-import.py (+1/-1)
summit/common/management/commands/lpupdate.py (+1/-1)
summit/common/templatetags/__init__.py (+1/-1)
summit/common/tests.py (+1/-1)
summit/common/views.py (+1/-1)
summit/schedule/__init__.py (+1/-1)
summit/schedule/admin/__init__.py (+1/-1)
summit/schedule/admin/agendaadmin.py (+1/-1)
summit/schedule/admin/attendeeadmin.py (+1/-1)
summit/schedule/admin/crewadmin.py (+1/-1)
summit/schedule/admin/leadadmin.py (+1/-1)
summit/schedule/admin/meetingadmin.py (+1/-1)
summit/schedule/admin/roomadmin.py (+1/-1)
summit/schedule/admin/slotadmin.py (+1/-1)
summit/schedule/admin/summitadmin.py (+1/-1)
summit/schedule/decorators.py (+1/-1)
summit/schedule/fields.py (+1/-1)
summit/schedule/forms.py (+1/-1)
summit/schedule/management/__init__.py (+1/-1)
summit/schedule/management/commands/__init__.py (+1/-1)
summit/schedule/management/commands/autoschedule.py (+1/-1)
summit/schedule/management/commands/checkschedule.py (+1/-1)
summit/schedule/management/commands/deadblueprints.py (+1/-1)
summit/schedule/management/commands/fixtimeoffset.py (+1/-1)
summit/schedule/management/commands/import_live_data.py (+1/-1)
summit/schedule/management/commands/initslots.py (+1/-1)
summit/schedule/management/commands/randomise.py (+1/-1)
summit/schedule/management/commands/reschedule.py (+1/-1)
summit/schedule/management/commands/trackfix.py (+1/-1)
summit/schedule/models/__init__.py (+1/-1)
summit/schedule/models/agendamodel.py (+1/-1)
summit/schedule/models/attendeemodel.py (+1/-1)
summit/schedule/models/crewmodel.py (+1/-1)
summit/schedule/models/leadmodel.py (+1/-1)
summit/schedule/models/roommodel.py (+1/-1)
summit/schedule/models/slotmodel.py (+1/-1)
summit/schedule/models/trackmodel.py (+1/-1)
summit/schedule/render.py (+1/-1)
summit/schedule/templatetags/__init__.py (+1/-1)
summit/schedule/templatetags/datetime.py (+1/-1)
summit/schedule/templatetags/schedule_perms.py (+1/-1)
summit/schedule/tests/__init__.py (+1/-1)
summit/schedule/tests/tests.py (+1/-1)
summit/settings.py (+1/-1)
summit/sponsor/__init__.py (+1/-1)
summit/sponsor/admin.py (+1/-1)
summit/sponsor/forms.py (+1/-1)
summit/sponsor/models.py (+1/-1)
summit/sponsor/templatetags/__init__.py (+1/-1)
summit/sponsor/templatetags/formatting.py (+1/-1)
summit/sponsor/tests.py (+1/-1)
summit/sponsor/views.py (+1/-1)
summit/urls.py (+1/-1)