Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 21:58:28 +0000 (22:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 21:58:28 +0000 (22:58 +0100)
commit5032fb4f5425153c29d1fbad5aade8c4a0b0863e
treedbe1481dbcb078c45cebf296444ed1cbfda6ac98
parent3720f100eaab57e89faf9a3dab1d07b9948711b7
parent48abca7996d8c6cf22065fb9d658ac19f04978f4
Merge branch 'MDL-53034-master' of git://github.com/jleyva/moodle