Merge branch 'wip-MDL-40137-m25' of git://github.com/samhemelryk/moodle into MOODLE_2...
commit5e069cbd969540ce5c1100f515c1a9d657b5dc58
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 23:45:27 +0000 (18 01:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Jun 2013 23:45:27 +0000 (18 01:45 +0200)
tree3216d631ea5a2cec451821d0a82e42d6c98812bd
parent3d19b183c66157e3f426bddd13feb4d891a4410c
parent6fa5e8658a97cc2dde8e00347e604947a57a8b7a
Merge branch 'wip-MDL-40137-m25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE