Merge branch 'MDL-52544-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 02:04:18 +0000 (04:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Jul 2016 02:04:18 +0000 (04:04 +0200)
commit74ec2dd63d8b8e6e4f99dd3e5e7dbb5a537d467f
treec9553ab9054ac304d721e8b5d4007fc718abaf4d
parent9e91ff52c90753df3a893690921b4bfe1033a5b6
parent87c6f9ab23a8d053b0fe43b9fabbf7358363698a
Merge branch 'MDL-52544-master' of git://github.com/damyon/moodle