Merge branch 'MDL-29035-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:42:40 +0000 (02:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 11 Nov 2011 01:42:40 +0000 (02:42 +0100)

Trivial merge