Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 04:51:33 +0000 (12:51 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 18 Dec 2017 04:51:33 +0000 (12:51 +0800)
commit2d08e6565a07f1892f4dac52152880326b04ed9f
tree8655a237d57990a9bd5c3273381abc9abdbeea7e
parente95db3416ce09259dad6abb8c7c8e97a99105cd2
parentaa6b85d2b7a62b8f4d119ddff2e91349178178b7
Merge branch 'MDL-57431-master' of git://github.com/lameze/moodle