Calen Pennington 95f8f811c5 Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged ...

Conflicts:
	common/lib/xmodule/xmodule/course_module.py

2013-03-11 10:49:29 -04:00

..

djangoapps

Make display_name defaulting explicit

2013-03-08 14:58:09 -05:00

lib

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-11 10:49:29 -04:00

static

Merge remote-tracking branch 'origin/master' into feature/alex/poll-merged

2013-03-08 00:40:18 -05:00

templates

Merged, delete Ace.

2013-02-19 14:56:37 -05:00

test

fix test_conditional, add new conditional to "conditional_and_poll" test course

2013-03-06 19:52:18 +02:00

xml_cleanup.py

Pep8 autofixes

2013-02-06 11:13:50 -05:00