Merge branch 'MDL-56668-m' of https://github.com/micaherne/moodle
commitb7b5b35cf50f145a6257dba11e204e6d7333cc6f
authorDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:23:10 +0000 (4 14:23 +0000)
committerDan Poltawski <dan@moodle.com>
Fri, 4 Nov 2016 14:23:10 +0000 (4 14:23 +0000)
tree1fd7ca04436992f3a9a465dbe26b625ba00e01ea
parent246288c3f91dc04a460acd1391811ba12b4b372f
parentfc60769302dd997d9d894a301f7f74925f5bfc4b
Merge branch 'MDL-56668-m' of https://github.com/micaherne/moodle