Merge branch 'wip-MDL-58092-31' of git://github.com/marinaglancy/moodle into MOODLE_3...
commitce51586b24076137c982d2be4887a22ab326998e
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 09:56:01 +0000 (28 10:56 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 09:56:01 +0000 (28 10:56 +0100)
tree0ce6079d9497a959142cbcbd7b32051f5a7732d8
parentb9866e9e7188e80c30ba45a109f630dcc2a7aea6
parentf494350d401fdf83843d065d16afa3d2a76965a6
Merge branch 'wip-MDL-58092-31' of git://github.com/marinaglancy/moodle into MOODLE_31_STABLE