Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 11:08:08 +0000 (11:08 +0000)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Dec 2016 11:08:08 +0000 (11:08 +0000)
commit7cdc6974d4fa999cb5f959de3124cce78c705223
tree72616413475c8f5217f04e0469ae7f2b5e45f61a
parent3bb4ad75215f05de425abc00ae5fbdd216baf1d7
parentef97f1a24e6b638e5379fea190a665925e61b9df
Merge branch 'MDL-56971-m' of https://github.com/micaherne/moodle