Merge branch 'MDL-33123-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 10:33:54 +0000 (12:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2012 10:33:54 +0000 (12:33 +0200)

Trivial merge