Merge branch 'release' into master

Browse Source

Conflicts:
	common/lib/xmodule/xmodule/videoalpha_module.py

...

This commit is contained in:

Feanil Patel

2013-08-07 16:14:21 -04:00

parent 8ae3341667 7237f8026f

commit e942e93f9d

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available