Merge branch 'wip-MDL-50851-backupfix' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 14 Jan 2016 03:03:26 +0000 (11:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 14 Jan 2016 03:03:26 +0000 (11:03 +0800)

Trivial merge