Merge branch 'MDL-28024' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 26 Jun 2011 23:44:40 +0000 (01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 26 Jun 2011 23:44:40 +0000 (01:44 +0200)
commita8e6c39e9f01e6a338894025af4bd49c069819fc
tree16395c7e0e2ce2bf40f834fdc0c5b7be9e7d24de
parent560f549593eef6e9d736f76a000017177f6a488d
parent5cc532e8e9b85676c7a741bf8170157bb83cb91b
Merge branch 'MDL-28024' of git://github.com/timhunt/moodle