Merge branch 'MDL-32061-master-2' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2012 00:31:47 +0000 (02:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2012 00:31:47 +0000 (02:31 +0200)

Trivial merge