Tony Aldridge 3485df15f2 Merge remote-tracking branch 'upstream/master' ... Conflicts: README.rst		2013-08-24 10:36:21 +01:00
..
__init__.py	initial import (with InheritanceCastModel)	2009-07-02 14:03:02 -04:00
fields.py	Removed reinvented wheel	2013-08-12 13:22:34 +04:00
models.py	Merge branch 'silonov-json_fields_support'	2013-08-17 01:40:09 -07:00
tests.py	Merge remote-tracking branch 'upstream/master'	2013-08-24 10:36:21 +01:00