Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 22:09:08 +0000 (00:09 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 22:09:08 +0000 (00:09 +0200)
commit5968add63fcc010c77d48f947b74871c35ea9524
tree8934988e7a155788edec6bda1d93159be416c72e
parentaf8b948e2b1ca5cd5f1b03b10baa94354e0c3d87
parentf029401b363bde798d27db1a5c59bd972f04ea56
Merge branch 'MDL-55083_master' of https://github.com/tunele/moodle