Merge branch 'MDL-57268-master' of https://github.com/xow/moodle
commitde5e61c4ba50b545086ecacebd5206c9d47fef07
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2016 01:22:26 +0000 (20 02:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2016 01:22:26 +0000 (20 02:22 +0100)
tree7e8ee43878c44dd49f6c6a113699bb632e3d5a59
parentcaf52b578b69809751c37e7bbde10e9c09db35ec
parent22c98e1e5a05182fcac7cd0f0232ac3bcea4d267
Merge branch 'MDL-57268-master' of https://github.com/xow/moodle