Merge branch 'MDL-50267-master' of git://github.com/junpataleta/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 22:59:19 +0000 (00:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 22:59:19 +0000 (00:59 +0200)
commitbdce994c5f73593a76c2922ff5bdf532b2244b71
tree59e4157badd82de3d36e92ee9ff6c2a863bc20b8
parentddf1d5c692a508eec386124d98b00cfcd41cb139
parentfb77333453670db489a6e61a18219ed3cbe93d9c
Merge branch 'MDL-50267-master' of git://github.com/junpataleta/moodle