Merge branch 'master' of https://github.com/dimonb/mongoengine

Conflicts: mongoengine/base.py
2012-09-03 11:00:41 +01:00 · 2012-09-03 11:00:41 +01:00 · 52f85aab18
commit 52f85aab18
parent 6e7f2b73cf ab60fd0490
5 changed files with 28 additions and 7 deletions
--- a/1
+++ b/1
@ -122,3 +122,4 @@ that much better:
 * Sergey Nikitin
 * psychogenic
 * Stefan Wójcik
+ * dimonb