Merge branch 'MDL-34657_fixup' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Oct 2012 21:42:47 +0000 (23:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 4 Oct 2012 21:42:47 +0000 (23:42 +0200)

Trivial merge