Merge branch 'MDL-29048-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 17:55:31 +0000 (18:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Dec 2011 17:55:31 +0000 (18:55 +0100)

Trivial merge