Merge branch 'MDL-30339' of git://github.com/scriby/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:50:32 +0000 (00:50 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 20 Nov 2011 23:50:32 +0000 (00:50 +0100)

Trivial merge