Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 03:56:06 +0000 (11:56 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 03:56:06 +0000 (11:56 +0800)
commitaaa2788e42361b5e3032feacd9c0534fe47cb69c
treecea35b04631430b1275842c934f14b86dcd203ff
parent80b74762c9dad6c5127115f7146cfdf46ad70ab4
parentc823bfee62931f77d5d43312f8dbc0c0a2457466
Merge branch 'MDL-56129-master' of git://github.com/andrewnicols/moodle