Merge branch 'MDL-51458-master' of git://github.com/andrewnicols/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 11:13:39 +0000 (12:13 +0100)
committerDan Poltawski <dan@moodle.com>
Thu, 22 Oct 2015 11:13:39 +0000 (12:13 +0100)

Trivial merge