Merge branch 'wip-MDL-55505-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE
commit76b676b929349cb85a2cc89e0fcde75f90fa90cd
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:26:36 +0000 (12 19:26 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:26:36 +0000 (12 19:26 +0200)
tree346237ee4eefeb3199676f3765226971f25abcb0
parent03eab92866c8082bb532c158f51b8ff09981aaee
parent598e62100cca211a753d1ad2bfa87d5278e1c073
Merge branch 'wip-MDL-55505-30' of git://github.com/abgreeve/moodle into MOODLE_30_STABLE