Merge branch 'MDL-52499-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 09:44:16 +0000 (09:44 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 14 Dec 2015 09:44:16 +0000 (09:44 +0000)

Trivial merge