edx/edx-platform — pull request #6202 by dmitchell (2014-12-09 20:59:05+00:00)
Title: Make XmlModuleStore handle asides

@cpennington this pulls in your changes; so, it needs to be rebased after you merge yours and is blocked by yours.

@cpennington @doctoryes Just review https://github.com/edx/edx-platform/commit/38a3da81bb74aa97cfdd7181ddeca718ee6de895 which is the real PR