Merge branch 'MDL-57176-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Nov 2016 08:30:37 +0000 (08:30 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Nov 2016 08:30:37 +0000 (08:30 +0000)
commit1cbc34609229bed8e4e3ad069d729c2064eb7859
treeea8aa2ea519d5582ba62fcfdc8bdb0f032b93350
parentc56c23720b8bf9af519c05b7e4c1edca8504aaee
parent58ec5a315b16f3ebc45197833930100345f6fd7d
Merge branch 'MDL-57176-master' of git://github.com/damyon/moodle