Merge branch 'MDL-58160' of git://github.com/aolley/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 10:34:33 +0000 (11:34 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 28 Mar 2017 10:34:33 +0000 (11:34 +0100)
commit702be5ee4753fee888bffd7d6f7bb7f19d75fb58
tree27a496c68a9c52afc6745a0fcf5e819e8a5e6a77
parentc7c96ddc7cc799a77e1db780ffc43a58a4427b79
parentb3e4fbc011f0043ad24fe0ceed5501b5ad711f24
Merge branch 'MDL-58160' of git://github.com/aolley/moodle