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

Trivial merge