Merge branch 'master' into 0.8

Conflicts:
	.travis.yml
	AUTHORS
	docs/changelog.rst
	mongoengine/base.py
	mongoengine/queryset.py
	tests/queryset/queryset.py
This commit is contained in:
Ross Lawley
2013-04-12 13:36:29 +00:00
8 changed files with 45 additions and 16 deletions

View File

@@ -145,3 +145,4 @@ that much better:
* Jared Forsyth
* Kenneth Falck
* Lukasz Balcerzak
* Aleksandr Sorokoumov