Merge branch 'MDL-55245-master' of https://github.com/lucisgit/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 21:44:54 +0000 (23:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jul 2016 21:44:54 +0000 (23:44 +0200)
commit7b146b500528cee3a93534cb2179e0a6665209ae
tree43c5fc7bc322da3dbd59d4ba3d3cad1258a7fde7
parente90c60696a92970757814ccaed7ab56564a29de9
parentb37b6cd8ef46356b8a5a16ad5585821c1e123aba
Merge branch 'MDL-55245-master' of https://github.com/lucisgit/moodle