Merge branch 'MDL-28436' of git://github.com/nebgor/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 17:13:00 +0000 (19:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 17:13:00 +0000 (19:13 +0200)

Trivial merge