Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 15:07:00 +0000 (16:07 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 1 Aug 2016 15:07:00 +0000 (16:07 +0100)
commitb9fe2f38d48b879d302409066d23d3873bb571e0
treeccc195c6de1f41b20b4db600a6dc34ab49f966f5
parent65a427cc64eb88193bb7a5f2a0ffac75ec6ec8bc
parent867b4131811e875ba20b83ffd8400def12f5e719
Merge branch 'MDL-55376-master' of git://github.com/cameron1729/moodle