Merge branch 'MDL-59535-master' of git://github.com/lameze/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:19:54 +0000 (14:19 +0200)
committerDavid Monllao <davidm@moodle.com>
Mon, 31 Jul 2017 12:19:54 +0000 (14:19 +0200)
commit56b3a0a4772885eb5ed0091b59557214498adcc4
treec803f719a9998b7541c518292727c08288992a26
parent549e57410f6ec1533285cb555fa8c614ee747a92
parent026bfb76044d0e197689082c7e337973b0578905
Merge branch 'MDL-59535-master' of git://github.com/lameze/moodle