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

Trivial merge