Merge branch 'master' into 0.8

Conflicts: .travis.yml
2013-01-09 08:52:24 +00:00 · 2013-01-09 08:52:24 +00:00 · 5907dde4a8
commit 5907dde4a8
parent 50905ab459 8e038dd563
1 changed files with 5 additions and 6 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -2,12 +2,11 @@
 language: python
 services: mongodb
 python:
-    - 2.5
-    - 2.6
-    - 2.7
-    - 3.1
-    - 3.2
-    - 3.3
+    - "2.5"
+    - "2.6"
+    - "2.7"
+    - "3.2"
+    - "3.3"
 env:
  - PYMONGO=dev
  - PYMONGO=2.4.1