Merge branch 'MDL-34810' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 23:36:15 +0000 (01:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Aug 2012 23:36:15 +0000 (01:36 +0200)

Trivial merge