Merge branch 'MDL-61022-master' of git://github.com/damyon/moodle
commitf41e1773e9054ba1565fe0ffe6561e153145ce10
authorDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:21:26 +0000 (18 10:21 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 18 Dec 2017 09:21:26 +0000 (18 10:21 +0100)
tree6e2e71a31cec97bfccf48fa7eb8b541c7569d202
parentee35376e28816d960576a7dc6a9b299d042ffedb
parentff3e43eeb0a2d9625529234c2e11bcf4e4f1d42f
Merge branch 'MDL-61022-master' of git://github.com/damyon/moodle