Merge branch 'MDL-29768-master' of git://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 15:46:18 +0000 (17:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Sun, 16 Oct 2011 15:46:18 +0000 (17:46 +0200)

Trivial merge