Han Su Kim bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved ...

Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt

2014-03-06 16:56:16 -05:00

..

acceptance

add location of handouts in loc_mapper

2014-03-06 15:53:45 +05:00

data

Add tests and clean up A/B testing

2014-03-05 13:46:03 -05:00

db_cache

Update schema for bok-choy database

2014-02-27 10:27:29 -05:00

db_fixtures

Acceptance test for language selector

2014-02-14 10:32:11 -05:00

test_microsites

This PR addresses the open feedback on the Microsites feature

2014-02-28 16:27:12 -05:00