Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Jun 2016 06:49:25 +0000 (14:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 23 Jun 2016 06:49:25 +0000 (14:49 +0800)

Trivial merge