Brian Talbot 47aacc70b7 Merge branch 'master' into feature/btalbot/studio-alerts

2013-03-02 22:11:16 -05:00

..

djangoapps

Merge pull request #1530 from MITx/feature/cale/limit-login-lifetime

2013-03-01 11:37:46 -08:00

lib

Merge pull request #1550 from MITx/feature/cdodge/add-test-delete

2013-03-01 13:29:06 -08:00

static

Merge branch 'master' into feature/btalbot/studio-alerts

2013-03-02 22:11:16 -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