Merge branch 'master' into develop

This commit is contained in:
Martin Mahner 2013-11-26 11:10:18 +01:00
commit eacb6adeec

View file

@ -12,9 +12,9 @@ env:
matrix: matrix:
exclude: exclude:
- python: 3.3 - python: 3.3
env: DJANGO=1.4 env: DJANGO=1.4.10
- python: 3.3 - python: 3.3
env: DJANGO=1.5 env: DJANGO=1.5.5
install: install:
- "pip install coverage==3.7" - "pip install coverage==3.7"