Merge branch 'MDL-28686' of git://github.com/bostelm/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 22:45:45 +0000 (00:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Sep 2011 22:45:45 +0000 (00:45 +0200)

Trivial merge