Merge branch 'install_master' of git://git.moodle.org/moodle-install
authorDamyon Wiese <damyon@moodle.com>
Fri, 10 Jan 2014 06:19:31 +0000 (14:19 +0800)
committerDamyon Wiese <damyon@moodle.com>
Fri, 10 Jan 2014 06:19:31 +0000 (14:19 +0800)

Trivial merge