Merge branch 'MDL-56720-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 15:00:21 +0000 (15:00 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 10 Nov 2016 15:00:21 +0000 (15:00 +0000)
commite3cc23ae862205f46c61244dc070ca7c67946d69
tree308300eeff3cc2794029c3ac9031b34d4c2a8e59
parent213fc325adf8709399764d26ae35a9b9ac1cf757
parent3c7387722d4d8066fc356d117d6dd358e1d005c9
Merge branch 'MDL-56720-master' of git://github.com/junpataleta/moodle