Merge branch 'master' of github.com:MongoEngine/mongoengine

This commit is contained in:
Ross Lawley 2013-05-21 09:12:38 +00:00
commit 048c84ab95

View File

@ -1,9 +1,8 @@
from importlib import import_module
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import UserManager from django.contrib.auth.models import UserManager
from django.core.exceptions import ImproperlyConfigured from django.core.exceptions import ImproperlyConfigured
from django.db import models from django.db import models
from django.utils.importlib import import_module
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _