Merge branch 'wip-MDL-44640-fix' of git://github.com/marinaglancy/moodle
commit7f64df41317d058ba8ac95e0c8fdf3553b23978a
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 04:43:55 +0000 (30 12:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Sep 2015 04:43:55 +0000 (30 12:43 +0800)
tree1ca4c4a7a287d693b8f4c2ac08250e4645ed1983
parentdba0fdc2bc0b6115ee66960defd141c52b0cef57
parente7b161f0b2b7c0428ab0ad92895629f7299854d9
Merge branch 'wip-MDL-44640-fix' of git://github.com/marinaglancy/moodle