Merge branch 'MDL-52568_master' of https://github.com/kevin-bruton/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 16:48:11 +0000 (16:48 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Jan 2016 16:48:11 +0000 (16:48 +0000)
commitc8c905577c513b9151417790e18b891eab5229cf
tree1e9db3d8c9078566c795fe51b25f59329c612cce
parent31ed36f1936a55a75c01baefbd06885048b64fcc
parentcfd8c0fe094cf8c14bdd59cc1b40c436f8ee5621
Merge branch 'MDL-52568_master' of https://github.com/kevin-bruton/moodle