Merge branch 'MDL-32454-master-1' of git://git.luns.net.uk/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 23:47:14 +0000 (01:47 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Apr 2012 23:47:14 +0000 (01:47 +0200)

Trivial merge