Merge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 23:42:34 +0000 (01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Jul 2016 23:42:34 +0000 (01:42 +0200)
commita339f0dde0edcc9f90b28f0ef3ed430a91af753d
treeafc337176831bbe5f61275b885fd06ab7aae98fe
parent6f9ad7e2db0748876e79317b5c437596df3de370
parent25fbce21e7499add67ff69e95c154935579c93fb
Merge branch 'wip-mdl-54860-m' of https://github.com/rajeshtaneja/moodle