Merge branch 'wip-MDL-45390-master' of git://github.com/abgreeve/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:10:31 +0000 (14:10 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 May 2016 06:10:31 +0000 (14:10 +0800)
commit9d00c6e9e541f9a1634a871f3e2d108c0367e3e1
tree1330f8bbe496184aef933997bc1ad5e263dfc179
parentd9e7af1d6a7ff249025aee6f3f4d2fa100b91ccf
parent41abbbbde53a356526ce2ae04f895bb65e57c30f
Merge branch 'wip-MDL-45390-master' of git://github.com/abgreeve/moodle