Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorMarina Glancy <marina@moodle.com>
Thu, 21 Aug 2014 02:18:35 +0000 (10:18 +0800)
committerMarina Glancy <marina@moodle.com>
Thu, 21 Aug 2014 02:18:35 +0000 (10:18 +0800)

Trivial merge