Merge branch 'MDL-49423-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 18:05:51 +0000 (19:05 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2017 18:05:51 +0000 (19:05 +0100)
commit0db24a200a42c44500061db60aceab83ff6ee8da
tree35e0bd6743c48000cf2a2028118d4b51884b5c7f
parent9f43d5052a294da7cad2d338d70992031aea7d24
parentb2551b4c86666b9445c8a0e7cc5094fa0c8f1f4f
Merge branch 'MDL-49423-master' of git://github.com/jleyva/moodle