Merge branch 'MDL-47649' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:14:19 +0000 (13:14 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 14 Oct 2014 12:14:19 +0000 (13:14 +0100)

Trivial merge