Merge branch 'MDL-45721_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:56:31 +0000 (00:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 23 Jun 2014 22:56:31 +0000 (00:56 +0200)

Trivial merge