From: Cody Heimberger <rcodyheimberger@gmail.com>
Date: Wed, 30 Jul 2014 22:04:50 +0000 (-0600)
Subject: Merge branch 'master' of https://github.com/certifiedloud/django_quiz
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=5afa5d4d385dccd044c0a9ebca9fa26f6e6a1b26;p=django_quiz.git

Merge branch 'master' of https://github.com/certifiedloud/django_quiz
---

5afa5d4d385dccd044c0a9ebca9fa26f6e6a1b26