Merge branch 'MDL-28679' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2011 22:03:46 +0000 (00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 19 Sep 2011 22:03:46 +0000 (00:03 +0200)

Trivial merge