Merge branch 'MDL-57631_master-disable-cli' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 15 Mar 2017 08:12:04 +0000 (08:12 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 15 Mar 2017 08:12:04 +0000 (08:12 +0000)

Trivial merge