Merge branch 'MDL-31245-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 17:45:29 +0000 (18:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jan 2012 17:45:29 +0000 (18:45 +0100)

Trivial merge