Merge branch 'MDL-31548-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Apr 2012 19:56:57 +0000 (21:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Apr 2012 19:56:57 +0000 (21:56 +0200)

Trivial merge