Merge branch 'MDL-45789_master' of https://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 23:16:27 +0000 (01:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Jun 2014 23:16:27 +0000 (01:16 +0200)

Trivial merge