Merge branch 'MDL-54019_master' of git://github.com/markn86/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 15:56:56 +0000 (16:56 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 2 May 2016 15:56:56 +0000 (16:56 +0100)
commit8adf0454c03ed065445ddc67e7c36c3ab741d3e4
tree0f99c449633adaae36992d1d505d31ae86cf379d
parentc2e07809e54227bb9f79d2f655fd005de1d65891
parente45aac5f8ece1a5eea7e0bfd3c87451e2fbbcaaf
Merge branch 'MDL-54019_master' of git://github.com/markn86/moodle