Merge branch 'MDL-33306' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:30:35 +0000 (00:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 3 Sep 2012 22:30:35 +0000 (00:30 +0200)

Trivial merge