Merge branch '0.10-maintenance'

Conflicts:
	tox.ini
This commit is contained in:
Daniel Neuhäuser 2013-06-27 16:52:34 +02:00
commit c02c23ee30
6 changed files with 17 additions and 1 deletions

View file

@ -2,4 +2,5 @@
envlist = py26, py27, pypy, py33
[testenv]
deps = blinker
commands = python run-tests.py []