Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 8 Mar 2017 04:02:17 +0000 (12:02 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 10 Mar 2017 18:04:44 +0000 (18:04 +0000)
commitc742c61956449d7fc4b335421f9f7cddc62cfdb1
tree0f8a99e7cce34f34325f6ed85a951bcb04708cf8
parente2310e4361b244813d8698cdfc79ba4f3b8792a1
parent26bf6d4ead38911bc3f071180a5130fd9f4bcdb7
Merge branch 'wip-mdl-57940' of https://github.com/rajeshtaneja/moodle