Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Apr 2017 08:13:55 +0000 (09:13 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Apr 2017 08:13:55 +0000 (09:13 +0100)
commit02eaa42f238c2ba359219c2e73667fe2768e1ce5
treed7b87b517d1702cf7e06bff501fc75fa33714d6a
parent6fdf167b0f2c9dd4e3accd951faeaf874d2ebc5d
parent6a36b8526ee42c19bfeffe5227325520cb69f2c2
Merge branch 'MDL-37765-MASTER' of https://github.com/jacac/moodle