Merge branch 'MDL-30975' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2012 23:53:09 +0000 (00:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2012 23:53:09 +0000 (00:53 +0100)

Trivial merge