Merge branch 'MDL-56440-master' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 18:55:23 +0000 (20:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 18:55:23 +0000 (20:55 +0200)
commit087476c71154209dcd5dd71661c1d648d7462954
treeb312b1bc7da45e6bb8c3ce7751f3b9b34a4394d7
parentb705cefa182e77fad9345ffe63ecd64c1fd12566
parente816b872ad1a3fa6f41811578e3d15f8cfeac4d5
Merge branch 'MDL-56440-master' of git://github.com/danpoltawski/moodle