Merge branch 'MDL-57163-30' of https://github.com/vvzh/moodle into MOODLE_30_STABLE
commitfb92dba76fd33e2cb7ab68dd9c8dd161032f96a4
authorDavid Monllao <davidm@moodle.com>
Tue, 29 Nov 2016 03:43:31 +0000 (29 11:43 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 29 Nov 2016 03:43:31 +0000 (29 11:43 +0800)
tree99d720c14945ca9489917fb0f77ff887ba8b18af
parentb80b3d02371162eccb76f72ba7a9838924e4acbe
parenta0f554f012bd5c80b52a4f2bb295d0e22f791f49
Merge branch 'MDL-57163-30' of https://github.com/vvzh/moodle into MOODLE_30_STABLE