Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 03:42:38 +0000 (11:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 4 May 2017 03:42:38 +0000 (11:42 +0800)
commit2e3c23b25f27727115c7266d4ec79d5d09160113
tree8f364b413c3399f3d72864ab4f22d83e6daad1c1
parentf8633212ee386123c76248e94551e6b755c71907
parent3b07da4a6d3c8bacc3a0611a2bf87471555bdaf8
Merge branch 'MDL-58707-master' of git://github.com/jleyva/moodle