From: Stephen Burrows <stephen.r.burrows@gmail.com>
Date: Thu, 24 Feb 2011 19:07:40 +0000 (-0500)
Subject: Merge branch 'master' into search
X-Git-Tag: philo-0.9~16^2~15^2~4
X-Git-Url: http://git.ithinksw.org/philo.git/commitdiff_plain/62a418ca34a8d4e8323e1c998c21b5e957739fd9

Merge branch 'master' into search
---

62a418ca34a8d4e8323e1c998c21b5e957739fd9
diff --cc models/fields/__init__.py
index 9e78273,d8ed839..25af832
--- a/models/fields/__init__.py
+++ b/models/fields/__init__.py
@@@ -1,12 -1,9 +1,13 @@@
  from django import forms
 +from django.core.exceptions import ValidationError
 +from django.core.validators import validate_slug
  from django.db import models
  from django.utils import simplejson as json
 +from django.utils.text import capfirst
 +from django.utils.translation import ugettext_lazy as _
  from philo.forms.fields import JSONFormField
  from philo.validators import TemplateValidator, json_validator
+ #from philo.models.fields.entities import *
  
  
  class TemplateField(models.TextField):