David Ormsbee 4ac7862975 Merge branch 'master' into feature/server_split ...

Conflicts:
	lms/urls.py

2012-08-13 09:21:02 -04:00

..

test_files

Merge remote-tracking branch 'origin/master' into dormsbee/multicourse

2012-07-05 16:22:50 -04:00

xmodule

Merge branch 'master' into feature/server_split

2012-08-13 09:21:02 -04:00

setup.py

Rename MalformedDescriptor to ErrorDescriptor

2012-08-01 11:42:39 -04:00