Merge branch 'master' into dev

Conflicts: AUTHORS docs/changelog.rst mongoengine/base.py
2011-10-12 00:35:01 -07:00 · 2011-10-12 00:35:01 -07:00 · 76d771d20f
commit 76d771d20f
parent 24b8650026 4d5f602ee7
4 changed files with 11 additions and 6 deletions
--- a/1
+++ b/1
@ -71,3 +71,4 @@ that much better:
 * Paul Aliagas
 * Paul Cunnane
 * Julien Rebetez
+