Merge branch 'MDL-29350-master-2' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 16:15:00 +0000 (17:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 17 Nov 2011 16:15:00 +0000 (17:15 +0100)

Trivial merge