Merge branch 'MDL-47791' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 23 Oct 2014 16:30:28 +0000 (17:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 24 Oct 2014 09:48:19 +0000 (11:48 +0200)

Trivial merge