Will Daly 3e8eac90d2 Merge remote-tracking branch 'origin/release' into merge-release-into-master ...

Conflicts:
	requirements/edx/github.txt

2015-07-30 11:43:19 -07:00

..

edx

Merge remote-tracking branch 'origin/release' into merge-release-into-master

2015-07-30 11:43:19 -07:00

edx-sandbox

Update lxml to 3.4.4

2015-07-13 16:14:39 -04:00

system/ubuntu

SAML2 third_party_auth provider(s) - PR 8018

2015-06-26 13:23:59 -07:00