Merge branch 'MDL-57791_master-fix4' of git://github.com/dmonllao/moodle
commit75535f16928cfc1ea7c819d964ac217d446efed1
authorDan Poltawski <dan@moodle.com>
Wed, 26 Jul 2017 08:34:21 +0000 (26 09:34 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 26 Jul 2017 08:34:21 +0000 (26 09:34 +0100)
treeb25ac41ea793750ac090433b92db787d897cfe0d
parenta5164e85f2681a3cda86d1e9eac59e7871d1d5c7
parent4a210b068811cc9a043fb47177e945a4a735da6b
Merge branch 'MDL-57791_master-fix4' of git://github.com/dmonllao/moodle