Merge branch 'MDL-31316-master-4' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:07:55 +0000 (11:07 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:07:55 +0000 (11:07 +0100)

Trivial merge