Merge branch 'MDL-50945-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:14:47 +0000 (12:14 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:14:47 +0000 (12:14 +0100)
commit69783d15da908362c36d327e3349bb9142e78344
tree7ef45fa36fa75f43c50ae48251c0fa8a3b775781
parentcae31eccfdeab40ecf163de1a9c825ac6dd460a7
parent9a3ef3893b8951dafb50f9663063189edcb3169d
Merge branch 'MDL-50945-master' of git://github.com/xow/moodle