Merge branch 'MDL-39883-master' of git://github.com/ankitagarwal/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:46:36 +0000 (00:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:46:36 +0000 (00:46 +0200)

Trivial merge