Merge branch 'wip-MDL-55930-master' of https://github.com/Beedell/moodle
commite14f5db6a08687f84c224aac86a787751e1af6f5
authorDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 04:49:46 +0000 (2 12:49 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 2 Nov 2016 04:49:46 +0000 (2 12:49 +0800)
treed85bb5ab8e90090ac9078aed532a766922992d69
parentcf0450185e043ffbe04a6418b1f75936da988d45
parent7983265241d79d5eba9a3ef46ef68402173a0c3f
Merge branch 'wip-MDL-55930-master' of https://github.com/Beedell/moodle