Merge branch 'MDL-40047-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 21:59:05 +0000 (23:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2013 21:59:05 +0000 (23:59 +0200)

Trivial merge