Merge branch '0.9' into pr/673

Conflicts: .travis.yml
2014-06-26 16:11:12 +01:00
parent 0e7878b406 dd51589f67
commit caba444962
9 changed files with 237 additions and 23 deletions
--- a/setup.py
+++ b/setup.py
@@ -72,7 +72,7 @@ setup(name='mongoengine',
      long_description=LONG_DESCRIPTION,
      platforms=['any'],
      classifiers=CLASSIFIERS,
-      install_requires=['pymongo>=2.5'],
+      install_requires=['pymongo>=2.7'],
      test_suite='nose.collector',
      **extra_opts
 )