Merge branch 'MDL-56045-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 11:24:59 +0000 (12:24 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 11:24:59 +0000 (12:24 +0100)
commit6036184fab0b0940bec255bc7c44346d3b8826e5
treef050362690f73397485ceec4dfcb3a80ebaf7108
parent76ff7302285e541a8e02d79f689ff7b9392617e0
parent65e961e4f202083be2f3f13d1c5b8e8ee7bd9d95
Merge branch 'MDL-56045-master' of git://github.com/jleyva/moodle