Merge branch 'MDL-57815-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 23:48:44 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Mar 2017 23:48:44 +0000 (00:48 +0100)
commit592cdff297a579912d82ab9f564ac1f49f8d7dff
treeb74d53dfdc57e9573ad25124bea1f5a6836c03ee
parent10948ae13302658e446671930175fb9d457e0b6c
parentbb676b74fe944716d55f13bede435b6045586467
Merge branch 'MDL-57815-master' of git://github.com/jleyva/moodle