3 Commits

Author	SHA1	Message	Date
Calen Pennington	c917725ff0	Merge remote-tracking branch 'origin/master' into feature/cale/cms-master ... Conflicts: common/lib/xmodule/xmodule/seq_module.py common/lib/xmodule/xmodule/template_module.py common/lib/xmodule/xmodule/x_module.py lms/djangoapps/courseware/tests/tests.py lms/djangoapps/courseware/views.py lms/static/sass/course.scss requirements.txt	2012-12-07 11:17:41 -05:00
Calen Pennington	630c2fa21e	Make jasmine testing quieter	2012-11-13 10:55:17 -05:00
Calen Pennington	bc69ed8c9e	Move logsettings to common, so that it's shared between cms and lms	2012-10-11 12:31:52 -04:00