Merge branch 'MDL-42241-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Oct 2013 23:58:51 +0000 (01:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Oct 2013 23:58:51 +0000 (01:58 +0200)

Trivial merge