Merge branch 'MDL-26384-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Feb 2012 23:48:32 +0000 (00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 7 Feb 2012 23:48:32 +0000 (00:48 +0100)

Trivial merge