Merge branch 'master' into 0.7

Conflicts: mongoengine/base.py
2012-08-07 10:41:49 +01:00
parent f45d4d781d abc764951d
commit 52d80ac23c
12 changed files with 163 additions and 53 deletions
--- a/3
+++ b/3
@@ -115,4 +115,5 @@ that much better:
 * Jaime Irurzun
 * Alexandre González
 * Thomas Steinacher
- * Tommi Komulainen
+ * Tommi Komulainen
+ * Peter Landry