Merge branch 'MDL-28033' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2011 15:12:40 +0000 (17:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Jun 2011 15:12:40 +0000 (17:12 +0200)
commit32038aaccc3ee839f9f9416bd2931922d0ddf94a
treefad389cafc520af512f7c97cacc9ceea04d7c4bc
parent3bdc10150c8c3a959970b7d9489afea44432edd9
parent2779cc7d89f03cee1dfbb02cec4b9a61057e153d
Merge branch 'MDL-28033' of git://github.com/timhunt/moodle