Merge branch 'MDL-38542' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 15:48:37 +0000 (16:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Mar 2013 15:48:37 +0000 (16:48 +0100)
commitb81d5eab90fd877090d77d4454a5e88d85083dd4
treeaf732aecfb1ef2693f2030b0ec0cc30af0317126
parent1e1815bead3ba8e4e5d807464d65bdd912643265
parent1736fe3f743ac77ebc01302f685ff66fb6fd604c
Merge branch 'MDL-38542' of git://github.com/timhunt/moodle