Merge branch 'MDL-35038' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:24:17 +0000 (16:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 14:24:17 +0000 (16:24 +0200)

Trivial merge