Merge branch 'moodleurl_out_as_local_url' of git://git.luns.net.uk/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 03:31:24 +0000 (11:31 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 16 Jan 2012 03:31:24 +0000 (11:31 +0800)

Trivial merge