Merge branch 'MDL-30026' of git://github.com/stronk7/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Nov 2011 18:35:13 +0000 (19:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 13 Nov 2011 18:35:13 +0000 (19:35 +0100)

Trivial merge