Merge branch 'MDL-59132-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Jun 2017 22:45:04 +0000 (00:45 +0200)
committerDan Poltawski <dan@moodle.com>
Wed, 14 Jun 2017 11:30:40 +0000 (12:30 +0100)
commit0c272e07e2ca002c622d5b53c1a130eab64a7c19
tree7c35a181bb241a4ddabda5ad7ea88320d315ebcf
parentf30af085a9893c85675a47c92ab37e3aef8bd183
parent7c3c0fa323c2277042c02ac2dc6bfeda6549e6d2
Merge branch 'MDL-59132-master' of git://github.com/jleyva/moodle