Merge branch 'master' of https://github.com/lig/mongoengine into dev

Conflicts:
	.gitignore
This commit is contained in:
Harry Marr
2011-03-06 13:11:21 +00:00
3 changed files with 11 additions and 4 deletions

4
.gitignore vendored
View File

@@ -1,3 +1,5 @@
.*
!.gitignore
*.pyc
.*.swp
*.egg
@@ -9,4 +11,4 @@ mongoengine.egg-info/
env/
.settings
.project
.pydevproject
.pydevproject