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

Trivial merge