Merge branch 'MDL-41604-master-5' of git://github.com/mouneyrac/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Oct 2013 23:33:21 +0000 (01:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Oct 2013 23:33:21 +0000 (01:33 +0200)

Trivial merge