Merge branch 'MDL-30274-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 21:51:51 +0000 (22:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 16 Nov 2011 21:51:51 +0000 (22:51 +0100)

Trivial merge