Merge branch 'MDL-19575-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:12:08 +0000 (12:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 4 Oct 2011 10:12:08 +0000 (12:12 +0200)

Trivial merge