Merge branch 'MDL-35026' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:53:59 +0000 (17:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Aug 2012 15:53:59 +0000 (17:53 +0200)

Trivial merge