Merge branch 'MDL-56220-m' of https://github.com/micaherne/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:17:33 +0000 (01:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:17:33 +0000 (01:17 +0200)
commit209d36cc78b7f16b18556ca3a1bebfc824bb4690
tree4525814b1cb7527450284e607834895623ebf1d2
parent049a4f9a2035531ad3404e35273b56d8ff3ce58b
parent220f1cba3e92a6ba64b8d924faa75b80983bd2d3
Merge branch 'MDL-56220-m' of https://github.com/micaherne/moodle