Merge branch 'MDL-35147' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 16:43:02 +0000 (18:43 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 30 Aug 2012 16:43:02 +0000 (18:43 +0200)

Trivial merge