Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 10 May 2017 06:07:46 +0000 (14:07 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 10 May 2017 06:07:46 +0000 (14:07 +0800)
commitcb04995b30bba9db3c6a982bf430ac80cbad0450
treefed5694a50bfc9b0af92c223f6e32dd1d3f6cc7d
parenta5ea94d85fe4e816ba91245b2c6a2ad442890c93
parent89ab16414a82ed92bce49e603a214cb5b896d4a1
Merge branch 'MDL-58833-master' of git://github.com/andrewnicols/moodle