Tweak
Merge branch 'master' of github.com:Govexec/django-odd-utilities

Conflicts:
	setup.py