Merge branch 'wip-MDL-50851-backupfix' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 14 Jan 2016 08:31:14 +0000 (08:31 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 14 Jan 2016 08:31:14 +0000 (08:31 +0000)

Trivial merge