Tom Giannattasio 6a50da3d16 Merge branch 'master' into feature/tomg/fall-design

2012-08-13 10:26:28 -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/tomg/fall-design

2012-08-13 10:26:28 -04:00

setup.py

Rename MalformedDescriptor to ErrorDescriptor

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