Merge branch 'MDL-49536-master' of git://github.com/ryanwyllie/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:48:18 +0000 (20:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Aug 2015 18:48:18 +0000 (20:48 +0200)

Trivial merge