Commit 6dcd7cdd by Chris Dodge

Merge branch 'release'

Conflicts:
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
parents c1d63919 c7546271
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment