Merge branch 'wip-MDL-41594-m25' of git://github.com/marinaglancy/moodle into MOODLE_...
commit4008db6d6aa2b54ed47aeaadedb0b2e5ead3c87a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 21:21:04 +0000 (24 23:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Sep 2013 21:21:04 +0000 (24 23:21 +0200)
tree356e2de8d8f819214244e10a06b1ec6de2d4b565
parent90336898da2ab4e84cc29d02af07ef7786f82be0
parent09b8f892ac2cabe324d10953a1db587df2d8f32e
Merge branch 'wip-MDL-41594-m25' of git://github.com/marinaglancy/moodle into MOODLE_25_STABLE