Diana Huang 2df3fe9344 Revert "fix merge conflict" ...

This reverts commit acfd0d9fd6, reversing
changes made to e4194c99d8.

2013-04-26 12:40:35 -04:00

..

commands

Revert "fix merge conflict"

2013-04-26 12:40:35 -04:00

__init__.py

limit permissions of a role to courses and fix bugs

2012-08-08 10:42:29 -04:00