Merge branch 'master' into 0.8

Conflicts: docs/changelog.rst mongoengine/__init__.py
2012-11-06 14:28:55 +00:00
parent 3d5b6ae332 c31488add9
commit 3cc2c617fd
2 changed files with 2 additions and 3 deletions
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -7,8 +7,7 @@ Changes in 0.8
 - Inheritance is off by default (MongoEngine/mongoengine#122)
 - Remove _types and just use _cls for inheritance (MongoEngine/mongoengine#148)

-
-Changes in 0.7.X
+Changes in 0.7.6
 ================
 - Unicode fix for repr (MongoEngine/mongoengine#133)
 - Allow updates with match operators (MongoEngine/mongoengine#144)
--- a/python-mongoengine.spec
+++ b/python-mongoengine.spec
@@ -5,7 +5,7 @@
 %define srcname mongoengine

 Name:           python-%{srcname}
-Version:        0.7.5
+Version:        0.7.6
 Release:        1%{?dist}
 Summary:        A Python Document-Object Mapper for working with MongoDB