Merge branch 'MDL-52283-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 11:27:52 +0000 (11:27 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 30 Nov 2015 11:27:52 +0000 (11:27 +0000)

Trivial merge