Merge branch 'MDL-55028-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 20:13:48 +0000 (22:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2016 20:13:48 +0000 (22:13 +0200)
commit22a0896767a877b14353bc1be9fe60d1a774ceb8
treec01ee9aca205f5e2d4b6a2312696812c250449e3
parentd4ca1215bb724f35f758f82e9eb112843ea2e067
parentead440b649b39ea08d3b05a92485661202d857fe
Merge branch 'MDL-55028-master' of git://github.com/junpataleta/moodle