Ross Lawley 76d771d20f Merge branch 'master' into dev
Conflicts:
	AUTHORS
	docs/changelog.rst
	mongoengine/base.py
2011-10-12 00:35:01 -07:00
..
2011-10-12 00:35:01 -07:00
2011-09-09 05:52:43 -07:00
2011-06-07 15:14:41 +01:00
2009-12-19 16:04:05 +00:00
2011-07-18 08:35:29 +01:00