Merge branch 'MDL-1322-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 16:15:25 +0000 (18:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Jun 2017 16:15:25 +0000 (18:15 +0200)
commitdf30a5a25fc98efe80aa1b8ca2e1c880aa10b5a4
tree42a64076028cf094d53fd5ab774802a67d65f250
parent41c17610c0884deb1b68e6f6946e7bc4b94c112e
parent390098fa64c2572d0d8b055167023e4684245330
Merge branch 'MDL-1322-master' of git://github.com/junpataleta/moodle