Merge branch 'MDL-59685-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 22:36:07 +0000 (00:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 29 Aug 2017 22:36:07 +0000 (00:36 +0200)
commit08986e0c4266b4bf56b257e69a81a0d624d6da18
treed1a9233693b6322cebbe8ff7813d9d7bbd97ba29
parente517eb100c29226802f828a32f41737ce62c5431
parent47cb325821e91f6d605eee25f3fd0d8a25303912
Merge branch 'MDL-59685-master' of git://github.com/damyon/moodle