Merge branch 'MDL-54805-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE
commit6ac1f4e96ec186aacfb99d0b1f5d15c816f65331
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 16:08:57 +0000 (6 18:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 16:08:57 +0000 (6 18:08 +0200)
treeef3bdc5304a447db588f7c95f9e1db095c9f1151
parent9f812d260247e26a238e5209d4385d5b43b0d991
parent3ce17afe99fc4c66251b4c1e5d88e81fb52698b8
Merge branch 'MDL-54805-30' of git://github.com/junpataleta/moodle into MOODLE_30_STABLE