Merge branch 'wip-MDL-53557-fix' of https://github.com/marinaglancy/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 30 Mar 2016 01:33:46 +0000 (09:33 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 30 Mar 2016 01:33:46 +0000 (09:33 +0800)
commit99fddd48c34385d6b682dd31546bba4124b623da
treec2d32e4e7d57bd75f9a09157fe6d761e34b524ae
parent121b97e2edb34b582505f881670439526717280e
parent4ba67534d8819126b6a87b58a92a1e91be1835f0
Merge branch 'wip-MDL-53557-fix' of https://github.com/marinaglancy/moodle