edx-solutions/edx-platform — pull request #256 by e-kolpakov (2014-10-06 12:22:32+00:00)
Title: Rebase 20140926 merged xblock discussion changes

Merged discussion changes, resolved conflicts, fixed broken tests