Merge branch 'MDL-54948-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 09:48:10 +0000 (11:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 21 Jun 2016 09:48:10 +0000 (11:48 +0200)
commit878835db7f8f97382735f0124ba104160bf39a49
treeb7677d2664c49dc4363a7ae5000e667f8aa32b59
parent3584865b3a01400b74473c85e7b36940f0391cf6
parent6937d89be6f0c007c97ad72a15cf7a3b4402914a
Merge branch 'MDL-54948-master' of git://github.com/lameze/moodle