Merge branch 'MDL-22895-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2012 23:44:39 +0000 (01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 10 Apr 2012 23:44:39 +0000 (01:44 +0200)

Trivial merge