Merge remote-tracking branch 'hugovk/patch-2'

* hugovk/patch-2:
  Use latest Python 2.7

Conflicts:
	.travis.yml
This commit is contained in:
Matthew Brett 2014-07-04 00:53:08 +01:00
commit 9ba52f3471

View File

@ -4,7 +4,7 @@ language:
env:
global: LATEST_TAG=1
matrix:
- VERSION=2.6.9
- VERSION=2.6.6
- VERSION=2.7.8
- VERSION=3.2.5
- VERSION=3.3.5