Victor Shnayder 136946a334 Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule

2013-02-28 18:22:13 -05:00

..

djangoapps

Merge pull request #1526 from MITx/feature/cas/manual-policy-merged

2013-02-27 09:02:07 -08:00

lib

Merge remote-tracking branch 'origin/master' into feature/abarrett/annotatable_xmodule

2013-02-28 18:22:13 -05:00

static

merge from master. resolved conflict with test_responsetypes.py by using the version from master.

2013-02-28 11:22:32 -05:00

templates

Merged, delete Ace.

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

test

remove empty attempts and weights from simple test course

2013-02-21 15:41:59 -05:00

xml_cleanup.py

Pep8 autofixes

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