Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDamyon Wiese <damyon@moodle.com>
Thu, 19 Jun 2014 06:11:39 +0000 (14:11 +0800)
committerDamyon Wiese <damyon@moodle.com>
Thu, 19 Jun 2014 06:11:39 +0000 (14:11 +0800)

Trivial merge