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)

Trivial merge