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

Trivial merge