Merge branch 'master' into 0.8
Conflicts: .travis.yml
This commit is contained in:
		
							
								
								
									
										11
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								.travis.yml
									
									
									
									
									
								
							| @@ -2,12 +2,11 @@ | |||||||
| language: python | language: python | ||||||
| services: mongodb | services: mongodb | ||||||
| python: | python: | ||||||
|     - 2.5 |     - "2.5" | ||||||
|     - 2.6 |     - "2.6" | ||||||
|     - 2.7 |     - "2.7" | ||||||
|     - 3.1 |     - "3.2" | ||||||
|     - 3.2 |     - "3.3" | ||||||
|     - 3.3 |  | ||||||
| env: | env: | ||||||
|   - PYMONGO=dev |   - PYMONGO=dev | ||||||
|   - PYMONGO=2.4.1 |   - PYMONGO=2.4.1 | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user