Merge branch 'MDL-51586-master' of git://github.com/xow/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 09:47:13 +0000 (10:47 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 09:47:13 +0000 (10:47 +0100)

Trivial merge