Merge branch 'master' into 0.8M

Conflicts:
	AUTHORS
	docs/django.rst
	mongoengine/base.py
	mongoengine/queryset.py
	tests/fields/fields.py
	tests/queryset/queryset.py
	tests/test_dereference.py
	tests/test_document.py
This commit is contained in:
Ross Lawley
2013-04-17 11:57:53 +00:00
17 changed files with 474 additions and 101 deletions

11
AUTHORS
View File

@@ -129,6 +129,16 @@ that much better:
* Peter Teichman
* Jakub Kot
* Jorge Bastida
* Aleksandr Sorokoumov
* Yohan Graterol
* bool-dev
* Russ Weeks
* Paul Swartz
* Sundar Raman
* Benoit Louy
* lraucy
* hellysmile
* Jaepil Jeong
* Stefan Wójcik
* Pete Campton
* Martyn Smith
@@ -145,4 +155,3 @@ that much better:
* Jared Forsyth
* Kenneth Falck
* Lukasz Balcerzak
* Aleksandr Sorokoumov