Merge branch 'MDL-58684-master-rerun-upgrade-step' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 04:30:59 +0000 (12:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 May 2017 04:30:59 +0000 (12:30 +0800)

Trivial merge