Merge branch 'MDL-52332-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 10:23:07 +0000 (10:23 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 10:23:07 +0000 (10:23 +0000)

Trivial merge