Merge branch 'MDL-35037' of git://github.com/danpoltawski/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2013 23:59:39 +0000 (00:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 11 Feb 2013 23:59:39 +0000 (00:59 +0100)

Trivial merge