Merge branch 'MDL-54866-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 14:50:44 +0000 (15:50 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 4 Oct 2016 14:50:44 +0000 (15:50 +0100)
commiteedf01895e539667bee99755860d20fd2212c762
tree2c7e80323c8599c21710981c181edfbd19aa18a9
parented3956a39a45f024b9a38bd2721bea965d770a2e
parent7c1cb3bf5a8a81605162019149ef975298d4f6ff
Merge branch 'MDL-54866-master' of git://github.com/jleyva/moodle