Merge branch 'MDL-58916-master' of https://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 10:01:13 +0000 (11:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 15 May 2017 10:01:13 +0000 (11:01 +0100)
commit6dbfda8109997229d813af19f83422590be9fcc6
tree4d224f34dc69072a8414a4306d0c6a43cc28d4cd
parent401046661400529c41150b615ebde6b1eefea06f
parent40ca0bd9148e9b21f1d693048c0430964544a83a
Merge branch 'MDL-58916-master' of https://github.com/xow/moodle