Merge branch 'MDL-56935-master' of git://github.com/junpataleta/moodle
commited81eab30961f4dae4513f7f40e1f1bc0c1747b4
authorDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 10:49:23 +0000 (14 10:49 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Nov 2016 10:49:23 +0000 (14 10:49 +0000)
tree3b4bba77e901f39dd299015c396bff6c5dcaebe1
parent95bfa525493bc56d647067e6e916b376afe89e66
parentcf2bc26911b63f86f786434282219c4ca57b4085
Merge branch 'MDL-56935-master' of git://github.com/junpataleta/moodle