Merge branch 'MDL-35226-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Sep 2012 09:06:33 +0000 (11:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Sep 2012 09:06:33 +0000 (11:06 +0200)

Trivial merge