Merge branch 'MDL-56529-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 21 Oct 2016 11:03:56 +0000 (13:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 21 Oct 2016 11:03:56 +0000 (13:03 +0200)
commitbf6cfca285a8baf6c96a64158bafd2724ded59ae
tree47745755727bfa8ced3446aa0500bf0f1924c5d8
parent919b9dfabd69f71c088f565746c547e6e169a0b7
parent0766dd669b2a64fef5fdb75f90819fbfb64d645f
Merge branch 'MDL-56529-master' of git://github.com/junpataleta/moodle