Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 14:34:31 +0000 (15:34 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2012 14:34:31 +0000 (15:34 +0100)

Trivial merge