Merge branch 'MDL-19575-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:12:08 +0000 (12:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:12:08 +0000 (12:12 +0200)
commitcdee9bd4f61f3de794db67360f902bd80ee1dac2
treeb47d3a93767db78c88a79f55b2fd86d297902076
parentf0bfd964bad45974b154efa1874e8ba6dd0b40b6
parent5eb1cec34f013fdcb559b66bc401f2845ce0bbb7
Merge branch 'MDL-19575-master' of git://github.com/ankitagarwal/moodle