Merge branch 'wip-MDL-55123-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:37:40 +0000 (19:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Sep 2016 17:37:40 +0000 (19:37 +0200)
commited55d47d03f12f88d26b116ad7c8b1a646cf329a
tree6e193cf9d54201fe49b97bc5bb4fdbe3e6f51c6d
parent9579b52372a529030ae2b467a3b5c58fb879b1e2
parent721e2def56a48fab4f8d3ec7847af5cd03f5ec79
Merge branch 'wip-MDL-55123-master' of git://github.com/marinaglancy/moodle