Merge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle
commit9004d7a51cfaca376f168dc95ecfd8c9ca27a9a0
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Apr 2013 23:27:39 +0000 (17 01:27 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Apr 2013 23:27:39 +0000 (17 01:27 +0200)
tree8ff86359190b390440bf94b3c402343b8773245d
parent91560510dc60ef4b5b1a678d7c6aec8aefbaf6f0
parentb1c2fc65e4c39ae198318fdb7ff297c725f78548
Merge branch 'wip-MDL-39145-m25' of git://github.com/marinaglancy/moodle