Merge branch 'wip-MDL-55844-30' of git://github.com/marinaglancy/moodle into MOODLE_3...
commitf38037357a7b37669a6d1061d49d4fff904eaaa6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:08:31 +0000 (6 16:08 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Sep 2016 14:08:31 +0000 (6 16:08 +0200)
tree7d1f61c9b26296877c1be6caa1233eb6eb81e200
parent03200f984ec46e97c40f5fb9422b30a10a44d046
parentf09f5a3c884ab74b96061012a54117a0bbebb20b
Merge branch 'wip-MDL-55844-30' of git://github.com/marinaglancy/moodle into MOODLE_30_STABLE