Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:28:31 +0000 (10:28 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 17 Jan 2017 10:28:31 +0000 (10:28 +0000)
commit419b2f1741740951e85348a486c8c306e1330b01
treedf349413c38f5d9bab90b3bff794f417596c2706
parentbb72d31944464b8b0166c07cbd13e268b1369ab4
parentada21cb0c836110f335ce3e3034038881091e985
Merge branch 'wip-mdl-57669-m' of https://github.com/rajeshtaneja/moodle