Merge branch 'MDL-31345_master' of git://github.com/lazydaisy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:13:53 +0000 (11:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 8 Feb 2012 10:13:53 +0000 (11:13 +0100)

Trivial merge