Andy Armstrong fe6668a550 Merge branch 'release' ...

Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt

2014-09-23 15:53:10 -04:00

..

edx

Merge branch 'release'

2014-09-23 15:53:10 -04:00

edx-sandbox

Upgrade scipy, lxml, boto

2014-09-17 10:48:33 -04:00

system/ubuntu

Moved brew-formulas.txt to Brewfile

2014-01-27 10:51:31 -05:00