Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 14:45:01 +0000 (15:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Feb 2014 14:45:01 +0000 (15:45 +0100)

Trivial merge