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

Conflicts: docs/changelog.rst
2012-06-18 21:10:14 +01:00
parent bd41c6eea4 a856c7cc37
commit 766d54795f
6 changed files with 44 additions and 2 deletions
--- a/3
+++ b/3
@@ -105,4 +105,5 @@ that much better:
 * Adam Reeve
 * Anthony Nemitz
 * deignacio
- * shaunduncan
+ * shaunduncan
+ * Meir Kriheli