Merge branch 'master' into 0.8

Conflicts: AUTHORS mongoengine/base.py tests/test_dereference.py
2013-04-18 13:30:00 +00:00
parent 1108586303 3f49923298
commit 76fddd0db0
4 changed files with 28 additions and 1 deletions
--- a/1
+++ b/1
@@ -139,6 +139,7 @@ that much better:
 * lraucy
 * hellysmile
 * Jaepil Jeong
+ * Daniil Sharou
 * Stefan Wójcik
 * Pete Campton
 * Martyn Smith