Merge branch '0.9' into pr/673

Conflicts:
	.travis.yml
This commit is contained in:
Ross Lawley
2014-06-26 16:11:12 +01:00
9 changed files with 237 additions and 23 deletions

View File

@@ -21,7 +21,7 @@ env:
- PYMONGO=2.7.1 DJANGO=1.6.5
- PYMONGO=2.7.1 DJANGO=1.5.8
- PYMONGO=2.7.1 DJANGO=1.4.13
matrix:
fast_finish: true
exclude:
@@ -65,3 +65,4 @@ notifications:
branches:
only:
- master
- "0.9"