From: tomwalker <tomwalker0472@gmail.com>
Date: Wed, 8 Oct 2014 17:16:05 +0000 (+0100)
Subject: Merge branch 'master' of github.com:tomwalker/django_quiz
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=998e3266f63a6cb906e1d42f8754371cdddae95b;p=django_quiz.git

Merge branch 'master' of github.com:tomwalker/django_quiz

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
---

998e3266f63a6cb906e1d42f8754371cdddae95b