Merge branch 'MDL-54793-master' of git://github.com/cameron1729/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 10:13:35 +0000 (11:13 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 27 Sep 2016 10:13:35 +0000 (11:13 +0100)
commit6027b0de050e2bbc0c4ff82191955700a453a119
tree096ab2a494c01d1d3ec3abd1ab5fb8386e980131
parent03b2e3a04d633b9a0f54ed8bd069e77cbcb098e8
parentb8d0f90ec77ca66c76ad0e928a5fb33573ebbd99
Merge branch 'MDL-54793-master' of git://github.com/cameron1729/moodle