Merge branch 'MDL-59093-master' of git://github.com/junpataleta/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 31 May 2017 10:09:06 +0000 (11:09 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 31 May 2017 10:09:06 +0000 (11:09 +0100)
commit67c70db5930ce301be02e2a45fe903f7f2c9ca22
treec172e11a4d1520b19c0f333b37fc2e4b2dfc4166
parent4ff1fef79f42f759339eda104bbec070f549b505
parent723742fee075127d95fba81f76e793a79ea29f33
Merge branch 'MDL-59093-master' of git://github.com/junpataleta/moodle