Merge branch 'w29_MDL-27796_m22_httphost' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:54:25 +0000 (10:54 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 25 Jul 2011 02:54:25 +0000 (10:54 +0800)

Trivial merge