cms · 305e9315ef147e4590ca80a7b7843ed34f6f030e · edx / edx-platform

Merge branch 'master' into feature/christina/unify-fields · fae8fd38

Conflicts:
	common/lib/xmodule/xmodule/capa_module.py
	common/lib/xmodule/xmodule/fields.py
	common/lib/xmodule/xmodule/peer_grading_module.py
	common/lib/xmodule/xmodule/tests/test_fields.py
	requirements/edx/github.txt

committed Jun 13, 2013

fae8fd38

Name	Last commit	Last update
..
djangoapps		Loading commit data...
envs		Loading commit data...
static		Loading commit data...
templates		Loading commit data...
.coveragerc		Loading commit data...
CHANGELOG.md		Loading commit data...
__init__.py		Loading commit data...
manage.py		Loading commit data...
one_time_startup.py		Loading commit data...
pydev_manage.py		Loading commit data...
urls.py		Loading commit data...
xmodule_namespace.py		Loading commit data...