From: Tom Walker <tomwalker0472@gmail.com>
Date: Tue, 25 Nov 2014 15:56:06 +0000 (+0000)
Subject: Merge pull request #29 from d0ugal/tox
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=fe4b26584dc50216c21be504e61272ecb10ef0eb;p=django_quiz.git

Merge pull request #29 from d0ugal/tox

Drop six back out, we get it with Django
---

fe4b26584dc50216c21be504e61272ecb10ef0eb