Merge branch 'MDL-56398-master' of git://github.com/lameze/moodle
commitd017e3fb48196636a10d1a9897e6d25aaf5b889e
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 08:34:13 +0000 (14 08:34 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 08:34:13 +0000 (14 08:34 +0000)
treef1e9115b2423aae7dd147f67ca4818057527f7ea
parent337b723b077d8496d26c4f9b62715d32fe07fc85
parent27a5b91f456ccae947bd85fe6b191e2bd508a637
Merge branch 'MDL-56398-master' of git://github.com/lameze/moodle