Ross Lawley 04b85ddbf2 Merge branch 'master' into 0.8 ...

Conflicts:
	.travis.yml
	AUTHORS
	docs/changelog.rst
	mongoengine/base.py
	mongoengine/queryset.py
	tests/queryset/queryset.py

2013-04-12 13:36:29 +00:00

..

__init__.py

Merge branch 'master' into 0.8

2013-04-12 13:36:29 +00:00