Merge tag 'hotfix-2013-05-28'

Hotfix for 2013-05-28

Conflicts:
	requirements/edx/github.txt
This commit is contained in:
Greg Price
2013-05-28 17:01:15 -04:00

Diff Content Not Available