Merge branch 'MDL-56765-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Nov 2016 00:27:39 +0000 (01:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 8 Nov 2016 00:27:39 +0000 (01:27 +0100)
commit42fe364f41db2352ca712e0bd5192e65a7f016cc
tree1a0220189a6c66b82f6af85e434b3b2c56a30556
parenta584a403cd3a591ac8280f0ed09996da99d60400
parent1f2e3279b2cd93aee4d17bc880a1f668e62e8d13
Merge branch 'MDL-56765-master' of git://github.com/jleyva/moodle