Merge branch 'MDL-51914' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 28 Oct 2015 11:10:38 +0000 (11:10 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 28 Oct 2015 11:52:03 +0000 (11:52 +0000)

Trivial merge