Merge branch 'MDL-57919-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Mar 2017 11:03:53 +0000 (13:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 29 Mar 2017 11:03:53 +0000 (13:03 +0200)
commit4f164a3e2d385b65f18117a47ddd04ae74ce75b3
tree2f6c2aad4842c99582b81eb0bae025b3b139d83b
parent85384d44c7f46738d4a155da8b1e17b8f7bfd44a
parenta934c896398eada9d78cb9b72115bc5e15a927a7
Merge branch 'MDL-57919-master' of git://github.com/jleyva/moodle