Merge branch 'MDL-28132' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 23:37:43 +0000 (01:37 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Jun 2011 23:37:43 +0000 (01:37 +0200)
commit4411596c276fd869526d650fd2008ed3100b26d4
treec387d54d2bccbaf8c3544a607ce08b4ed97be2e3
parentd72129829f282682ee303261590aa0c733b725fb
parentbaf706b5034260d2518721bd24312567917aa5b3
Merge branch 'MDL-28132' of git://github.com/timhunt/moodle