Merge branch 'MDL-30165-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:22:50 +0000 (11:22 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Nov 2011 10:22:50 +0000 (11:22 +0100)

Trivial merge