Merge branch 'MDL-35620' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 08:28:28 +0000 (10:28 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Oct 2012 08:28:28 +0000 (10:28 +0200)

Trivial merge