Merge branch 'MDL-60410_master' of git://github.com/dmonllao/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 09:01:21 +0000 (22:01 +1300)
committerJun Pataleta <jun@moodle.com>
Thu, 19 Oct 2017 09:01:21 +0000 (22:01 +1300)
commita0245c6aa07d265dec8d2fe4c375151e1dc90358
tree523533f5baf963e690e4347f77448a213218d96c
parent0a1a56307b9c4e932dc2ab7948f25b38be2024a0
parentc5705b3a0fe41db9dcadbf597c0d69173494134f
Merge branch 'MDL-60410_master' of git://github.com/dmonllao/moodle