Merge branch 'MDL-50714-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Aug 2015 22:06:01 +0000 (00:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Aug 2015 22:06:01 +0000 (00:06 +0200)

Trivial merge