Merge branch 'MDL-47449-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 18 Aug 2015 11:19:41 +0000 (13:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 19 Aug 2015 16:30:33 +0000 (18:30 +0200)

Trivial merge