Ben Patterson 5703adb722 Merge branch 'release' ...

Includes rc/2014-10-14

2014-10-16 20:11:55 -04:00

..

djangoapps

Merge pull request #5590 from cpennington/xblocks-with-children

2014-10-16 10:23:35 -04:00

lib

Merge pull request #5561 from edx/bugfix/ichuang/fix-invalid-key-name-child-id

2014-10-16 14:39:48 -04:00

static

Merge branch 'release'

2014-10-16 20:11:55 -04:00

templates

Merge pull request #5590 from cpennington/xblocks-with-children

2014-10-16 10:23:35 -04:00

test

Merge pull request #5590 from cpennington/xblocks-with-children

2014-10-16 10:23:35 -04:00

.gitignore

…

xml_cleanup.py

…