Rocky Duan 52c7136493 Merge branch 'lol' ...

Conflicts:
	lms/djangoapps/courseware/views.py
	lms/djangoapps/django_comment_client/utils.py
	lms/lib/comment_client.py
	lms/lib/datehelper
	lms/static/sass/application.scss
	lms/templates/discussion/index.html
	lms/templates/news.html

2012-07-25 18:41:24 -04:00

..

certificates

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

circuit

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

courseware

Merge branch 'lol'

2012-07-25 18:41:24 -04:00

django_comment_client

fixed eager

2012-07-25 18:25:28 -04:00

heartbeat

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

multicourse

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

simplewiki

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

ssl_auth

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

static_template_view

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00

staticbook

Cleaning up pep8 violations

2012-07-23 14:44:40 -04:00