Merge release from 2014-03-10 - #2885

Merged

cpennington merged 6 commits into

openedx:masterfrom

cpennington:merge-release-2014-03-10

Mar 10, 2014

Commits on Mar 10, 2014

Only add mentoring application to INSTALLED_APPS when in virtualenv

antoviaque
authored and
cpennington
committed
c3ae030
Update import location of `prefer_xmodules`

antoviaque
authored and
cpennington
committed
73f75f2
Normalize the representation of Scope.content data in MongoModulestore FieldData
cpennington
committed
760027b
Delay import of xmodule packages until after sys.path fixup
cpennington
committed
0a79b30
Merge pull request #2880 from edx/cale/fix-crazy-items-error
hkim823
committed
603a97f
Merge remote-tracking branch 'edx/release' into merge-release-2014-03-10
cpennington
committed
31a070d