Merge pull request #263 from open-craft/acceptance-rebase-20140926

Acceptance rebase 20140926

common/djangoapps/course_modes/models.py

@@ -6,7 +6,7 @@ from datetime import datetime
 
 from django.db import models
 from collections import namedtuple
-from django.utils.translation import ugettext as _
+from django.utils.translation import ugettext_lazy as _
 from django.db.models import Q
 
 from xmodule_django.models import CourseKeyField

lms/static/sass/discussion-app.scss

@@ -7,6 +7,8 @@
 @import 'base/mixins';
 @import 'base/extends';
 
+@import 'discussion/utilities/variables';
+@import 'discussion/mixins';
 // base - elements
 @import 'elements/typography';