Merge branch 'MDL-50945-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:14:47 +0000 (12:14 +0100)
committerDan Poltawski <dan@moodle.com>
Wed, 7 Oct 2015 11:14:47 +0000 (12:14 +0100)

Trivial merge