Merge branch 'MDL-54104-master' of git://github.com/jleyva/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Jun 2016 13:31:45 +0000 (14:31 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 30 Jun 2016 08:24:57 +0000 (09:24 +0100)
commit41c18b9681c16d3c43476f3c2dd8e4cb7c3cd5a5
tree9f1b5f3c379daeba3de901cacb99da62660843fa
parentab8ef7540605e297adbd08cd7b69ee9e416efbfc
parent9df9f1f0963902f17cf9cda0f3b4d902e770e58f
Merge branch 'MDL-54104-master' of git://github.com/jleyva/moodle