Merge branch 'MDL-58556-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 24 Apr 2017 10:05:09 +0000 (11:05 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 24 Apr 2017 10:05:09 +0000 (11:05 +0100)
commit371482f881270874d3d85c5c232640d1b15c7d0c
treeb2a899e208df5be03d7c96ccbb1bc35147a87515
parent0dcfadd9e417a85546d09ec0184e9ca1174befe0
parent44565f5cfc1d2d79a4a354102df72f04c052ee45
Merge branch 'MDL-58556-master' of git://github.com/damyon/moodle