Merge branch 'MDL-46588-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Sep 2014 22:23:09 +0000 (00:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Sep 2014 22:23:09 +0000 (00:23 +0200)

Trivial merge