Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:19:45 +0000 (19:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:19:45 +0000 (19:19 +0200)
commit9579b52372a529030ae2b467a3b5c58fb879b1e2
tree5fe895172354f05d77382c7a9edbc8d5b15adb4f
parent4e25d5e5eacce016b906116ed30d1f2aa9071bb6
parenta14cde804e420671dcedad5377ca9e650e0c69e6
Merge branch 'wip-MDL-55505-master' of git://github.com/abgreeve/moodle