Merge branch '41997-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE
commita348f55e3fc9ec429e30c06329a4c63958dae79a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:53:22 +0000 (1 19:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 17:53:22 +0000 (1 19:53 +0200)
treee54323b44d045f6353f41c598c908d632a7ca0e8
parent3ee1a66de9c60ef01be9c9f1254fdfd958c8e2ca
parent96f91e34bf4ff97add2e84fbc1fccc11ad589aa0
Merge branch '41997-25' of git://github.com/samhemelryk/moodle into MOODLE_25_STABLE