Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
authorDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 03:39:52 +0000 (11:39 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 11 Apr 2014 03:39:52 +0000 (11:39 +0800)

Trivial merge