Merge branch 'MDL-46079-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:32:11 +0000 (01:32 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 24 Jun 2014 23:32:11 +0000 (01:32 +0200)

Trivial merge