From e60ae31d84dd0c34f5afad4388b88198899619b5 Mon Sep 17 00:00:00 2001 From: Will Daly Date: Tue, 7 Jul 2015 12:10:25 -0700 Subject: [PATCH] Cherrypick hotfix-2015-07-07 into release candidate Includes the changes from 897fddba3e36011f6793040e5b1f296c6e399cbb. Those changes were introduced while resolving a merge conflict from release back into master. --- common/djangoapps/student/tests/test_credit.py | 1 + 1 file changed, 1 insertion(+) diff --git a/common/djangoapps/student/tests/test_credit.py b/common/djangoapps/student/tests/test_credit.py index b85d711e2d..3167069ccb 100644 --- a/common/djangoapps/student/tests/test_credit.py +++ b/common/djangoapps/student/tests/test_credit.py @@ -6,6 +6,7 @@ import datetime from mock import patch import pytz +from mock import patch from django.conf import settings from django.core.urlresolvers import reverse