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

Trivial merge