Merge branch 'MDL-59042-master' of git://github.com/snake/moodle
authorJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:29:03 +0000 (13:29 +0800)
committerJun Pataleta <jun@moodle.com>
Mon, 12 Jun 2017 05:29:03 +0000 (13:29 +0800)
commit8363ec8637045d0cc2fe9b4d7f8ca9fe33b16ed0
tree05ac64c3a7b5bb9f3262b82bc8dec31100423122
parent4c6063bff96984ed5c2c93f366fdf26c9bd304ef
parent4cd1d4c70f2cafd5a53346cc6fad63373bafc395
Merge branch 'MDL-59042-master' of git://github.com/snake/moodle