David Ormsbee 48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 ...

Conflicts:
	lms/envs/common.py

2013-09-09 10:18:25 -04:00

..

edx

Merge branch 'master' into ormsbee/verifyuser3

2013-09-09 10:18:25 -04:00

edx-sandbox

Merge pull request #556 from edx/ormsbee/requirments_notice

2013-09-06 08:35:36 -07:00

system

Add bulk email feature for instructors, with optout option

2013-08-29 12:40:31 -04:00