Merge branch 'MDL-33198-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 18:04:58 +0000 (20:04 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Sep 2012 18:04:58 +0000 (20:04 +0200)

Trivial merge