Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 07:41:34 +0000 (15:41 +0800)
committerDavid Monllao <davidm@moodle.com>
Mon, 24 Oct 2016 07:41:34 +0000 (15:41 +0800)
commit8823be0b600b2c125e6c3a57114833966000a5a5
tree31c4de2b25016ce98f2d6d1761da059372c04cf6
parent3ea1fa18cc6097e30631ebe355506edeb9f25bbf
parent1093e43bdaceed02cc9330f080b9aaffb87bc41f
Merge branch 'MDL-56516-master' of git://github.com/andrewnicols/moodle