Adam Palay 1a538388be Merge remote-tracking branch 'origin/release' ...

Conflicts:
	requirements/edx/edx-private.txt

2014-03-31 15:41:20 -04:00

..

edx

Merge remote-tracking branch 'origin/release'

2014-03-31 15:41:20 -04:00

edx-sandbox

Merge pull request #556 from edx/ormsbee/requirments_notice

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

system/ubuntu

Moved brew-formulas.txt to Brewfile

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