Merge branch 'MDL-51945-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 15:54:34 +0000 (16:54 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 2 Nov 2017 15:54:34 +0000 (16:54 +0100)
commitbe713b714458d4cabb40bc64de1fcea30baf1ddf
tree365fb7d0f46bf8158f119a1b5f38def4ae717055
parente20752c4f52ca57a702a79fb367f87620aafc783
parent8c4d7cee7949d5cc74cdf4e5625cc365bb07a8c7
Merge branch 'MDL-51945-master' of git://github.com/jleyva/moodle