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

..

capa

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

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

.coveragerc

perform a new merge from master, resolve conflicts

2013-01-03 10:43:03 -05:00

setup.py

Start converting COE storage model

2013-03-04 17:06:39 -05:00