Merge branch 'MDL-33778' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2012 22:54:39 +0000 (00:54 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Jun 2012 22:54:39 +0000 (00:54 +0200)

Trivial merge