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

Trivial merge