Merge branch 'MDL-29931' of git://github.com/mouneyrac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 00:43:07 +0000 (01:43 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Nov 2011 00:43:07 +0000 (01:43 +0100)

Trivial merge