Merge branch 'MDL-42639_master' of git://github.com/dmonllao/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 09:20:13 +0000 (10:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 29 Sep 2015 09:20:13 +0000 (10:20 +0100)
commit092455e4d42d8834a1b0d2d149ff9866fbd86ad3
tree2a1c96eb2d68745ffb93ec3566135c26b950f285
parentb33662e4d70622f9265f9175adba07f0a355e719
parent07d370849b4671f01859667dc6f267145286e565
Merge branch 'MDL-42639_master' of git://github.com/dmonllao/moodle