Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 16:50:07 +0000 (18:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 16:50:07 +0000 (18:50 +0200)
commitb705cefa182e77fad9345ffe63ecd64c1fd12566
tree74a73f5d7ba77e8776bafd7adaf6a3f52c52a863
parentaa46cb9503f8ee832bcea5a5c6413e09d0f7caec
parent260713fc8ebeba4981044fa748b488368ee51b14
Merge branch 'MDL-56300_master' of git://github.com/reskit/moodle