Merge branch 'MDL-40690_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE
commitbc27ec579e036bd89d7e8252d0b08376a095f8fa
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:17:43 +0000 (17 00:17 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jul 2013 22:17:43 +0000 (17 00:17 +0200)
treeaec666df4bdd041a4009024bf297dc77adea36ba
parent980746ce63ea1e6c8545d1f37e96b61c0c1bb521
parent623544086d3fb64e43a277693c2e6628dbc7a0ca
Merge branch 'MDL-40690_25' of git://github.com/dmonllao/moodle into MOODLE_25_STABLE