Merge branch 'master_MDL-35227' of git://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:39:07 +0000 (21:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Oct 2012 19:39:07 +0000 (21:39 +0200)

Trivial merge