Merge branch 'wip_MDL-40074' of https://github.com/jamiepratt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jul 2013 18:22:47 +0000 (20:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 18 Jul 2013 18:22:47 +0000 (20:22 +0200)

Trivial merge