Merge branch 'wip-MDL-48794-master' of git://github.com/marinaglancy/moodle
commit273612a2932c903064b5165188a48644030a2e2d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 12:04:58 +0000 (9 13:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Feb 2015 12:04:58 +0000 (9 13:04 +0100)
tree85479af048531755f93bb682b41c955bb05ef07e
parent8ddf449ae5e0fd4be20a17c917c6b725ade1d21c
parent698aa47e406962b0fce5e689b311f39c8bd5c174
Merge branch 'wip-MDL-48794-master' of git://github.com/marinaglancy/moodle