Merge branch 'wip-MDL-57511-master' of git://github.com/Beedell/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 15:39:55 +0000 (15:39 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 23 Jan 2017 15:39:55 +0000 (15:39 +0000)
commit4bd0a8a64adfafd666fb240a929ef0ac216bfda8
tree1d98ea9ab3f4e1df16b2bd2f9fb5448df7884cdc
parente3ee9d48844563db41ff6a4fc12222b481c917f4
parent8b0d254f0562330846f1a28d79e86866b0ce148f
Merge branch 'wip-MDL-57511-master' of git://github.com/Beedell/moodle