Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 22:04:59 +0000 (00:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 6 Jun 2016 22:04:59 +0000 (00:04 +0200)
commit31220d5a26ca4a233b2954df939e72d34202661f
tree42d713704a1a8755530886ced873fc19452843a4
parent512f9def5c2efe0c7e0b2d933b382edba1bb8a4e
parentf49a3e1791a151b72a764455ca3022c1f57e3d06
Merge branch 'MDL-54739-master' of git://github.com/lameze/moodle