merge changes

pandora/annotation/models.py

@@ -14,7 +14,6 @@ import ox
 
 from clip.models import Clip
 from entity.models import Entity
-from changelog.models import Changelog
 
 from item.utils import sort_string, get_by_key
 import managers

pandora/app/models.py

@@ -6,8 +6,6 @@ import json
 
 from django.db import models
 
-from changelog.models import Changelog
-
 import monkey_patch
 
 class Page(models.Model):

pandora/event/models.py

@@ -12,7 +12,6 @@ from item.models import Item
 from item import utils
 from person.models import get_name_sort
 from title.models import get_title_sort
-from changelog.models import Changelog
 
 import managers
 

pandora/item/models.py

@@ -34,7 +34,6 @@ from data_api import external_data
 
 from annotation.models import Annotation
 from archive import extract
-from changelog.models import Changelog
 from clip.models import Clip
 from entity.models import Entity
 from person.models import get_name_sort

pandora/news/models.py

@@ -5,7 +5,6 @@ from __future__ import division, with_statement
 from django.db import models
 import ox
 
-from changelog.models import Changelog
 import managers
 
 

pandora/place/models.py

@@ -10,7 +10,6 @@ from ox.django import fields
 import managers
 from annotation.models import Annotation, get_matches, get_super_matches
 from item.models import Item
-from changelog.models import Changelog
 
 
 class Place(models.Model):