Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 12:21:06 +0000 (12:21 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 12:21:06 +0000 (12:21 +0000)
commit64e032b6dae3c2a9d95b7e27a44ae8c177a6aebc
tree4c60e3f7d8b80ca24f41054c7f996bb5065cb728
parentf4f63fa6b0b4d502bb13984315c9c95abaea1d4a
parentba9a471d59b9d20b337bfed9ae741c81fd3d857c
Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle