Merge branch 'MDL-45574-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 18:18:06 +0000 (20:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 18:18:06 +0000 (20:18 +0200)

Trivial merge