Merge branch 'MDL-41914-weekly' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2013 14:06:32 +0000 (16:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Oct 2013 14:06:32 +0000 (16:06 +0200)

Trivial merge