Merge branch 'MDL-41188-master-fix1' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2013 13:44:31 +0000 (15:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Sep 2013 13:44:31 +0000 (15:44 +0200)

Trivial merge