Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle
commitc3925187ed68964d6ebf7b15bf561ea458087e85
authorJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 04:21:15 +0000 (10 17:21 +1300)
committerJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 04:21:15 +0000 (10 17:21 +1300)
treed3e330fc77d7ea8e7c13c80a22830fdde91d95c0
parent4ceece6ea1187ad034e07d34d43f86a42abe2502
parent20305a8a8fe2f84cf53801e434908510db47fa2b
Merge branch 'MDL-60758_master' of git://github.com/dmonllao/moodle